projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 75c43b6)
USB: make USB_STORAGE_ONETOUCH available with PM
authorAdrian Bunk <bunk@kernel.org>
Tue, 5 Feb 2008 07:57:45 +0000 (23:57 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 25 Apr 2008 04:16:34 +0000 (21:16 -0700)
As Torsten Kaiser pointed out, it seems the dependency of
USB_STORAGE_ONETOUCH on !PM should have been removed in commit
7931e1c6f8007d5fef8a0bb2dc71bd97315eeae9.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Torsten Kaiser <just.for.lkml@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/storage/Kconfig patch | blob | blame | history

diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 7e53333be0136c4f392545225b55d0e59cf7bfac..05cfc8473bd25eb31e857067672406b8cb20bf0a 100644 (file)
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -123,7 +123,7 @@ config USB_STORAGE_ALAUDA
 
 config USB_STORAGE_ONETOUCH
        bool "Support OneTouch Button on Maxtor Hard Drives (EXPERIMENTAL)"
-       depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL && !PM
+       depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL
        help
          Say Y here to include additional code to support the Maxtor OneTouch
          USB hard drive's onetouch button.