diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-11-28 19:34:03 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-11-28 19:34:03 -0500 |
| commit | 1ec28f8b8ada4e4f77d1af006a3a474f4f83b8e3 (patch) | |
| tree | 2e810e02a66cdec0bc82a8555796b7083ad03416 /Documentation/admin-guide/kernel-parameters.txt | |
| parent | 61647c77cb15354a329cbb36fe7a2253b36b51b1 (diff) | |
| parent | 2e6e902d185027f8e3cb8b7305238f7e35d6a436 (diff) | |
Merge v4.20-rc4 into drm-next
Requested by Boris Brezillon for some vc4 fixes that are needed for future vc4 work.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'Documentation/admin-guide/kernel-parameters.txt')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 81d1d5a74728..19f4423e70d9 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt | |||
| @@ -4713,6 +4713,8 @@ | |||
| 4713 | prevent spurious wakeup); | 4713 | prevent spurious wakeup); |
| 4714 | n = USB_QUIRK_DELAY_CTRL_MSG (Device needs a | 4714 | n = USB_QUIRK_DELAY_CTRL_MSG (Device needs a |
| 4715 | pause after every control message); | 4715 | pause after every control message); |
| 4716 | o = USB_QUIRK_HUB_SLOW_RESET (Hub needs extra | ||
| 4717 | delay after resetting its port); | ||
| 4716 | Example: quirks=0781:5580:bk,0a5c:5834:gij | 4718 | Example: quirks=0781:5580:bk,0a5c:5834:gij |
| 4717 | 4719 | ||
| 4718 | usbhid.mousepoll= | 4720 | usbhid.mousepoll= |