Merge branch 'for-4.12/asus' into for-linus

[mirror_ubuntu-artful-kernel.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 2ba45caabada3e88339e88ebdfaaedbb322085c8..0464a41cbf3bd37a37695db8526834ab8df6ef9a 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4115,6 +4115,9 @@
        usbhid.mousepoll=
                        [USBHID] The interval which mice are to be polled at.
 
+       usbhid.jspoll=
+                       [USBHID] The interval which joysticks are to be polled at.
+
        usb-storage.delay_use=
                        [UMS] The delay in seconds before a new device is
                        scanned for Logical Units (default 1).