diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 08:28:35 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 08:28:35 +0200 |
commit | 57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch) | |
tree | ee9289f0898054474b7e5054abdb3ffb78666436 /drivers/usb/storage/Kconfig | |
parent | Input: serio_raw - ensure we don't block in non-blocking read (diff) | |
parent | Linux 3.4-rc4 (diff) | |
download | linux-57b8628bb0ac4e47c806e45c5bbd89282e93869b.tar.xz linux-57b8628bb0ac4e47c806e45c5bbd89282e93869b.zip |
Merge commit 'v3.4-rc4' into next
Diffstat (limited to 'drivers/usb/storage/Kconfig')
-rw-r--r-- | drivers/usb/storage/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index fe2d803a6347..7691c866637b 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig @@ -222,7 +222,7 @@ config USB_LIBUSUAL for usb-storage and ub drivers, and allows to switch binding of these devices without rebuilding modules. - Typical syntax of /etc/modprobe.conf is: + Typical syntax of /etc/modprobe.d/*conf is: options libusual bias="ub" |