Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / usb / storage / Kconfig

diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index bedc4b9f2ac4ee28c6c52419ec5571cc8c068fac..7691c866637be6be835442396b1f545da5a7f09c 100644 (file)
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -42,7 +42,7 @@ config USB_STORAGE_REALTEK
 
 config REALTEK_AUTOPM
        bool "Realtek Card Reader autosuspend support"
-       depends on USB_STORAGE_REALTEK && CONFIG_PM_RUNTIME
+       depends on USB_STORAGE_REALTEK && PM_RUNTIME
        default y
 
 config USB_STORAGE_DATAFAB
@@ -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"