diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-02-05 02:57:45 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:34 -0400 |
| commit | 5ddeac117f869c0da85e41e89dd5ed1199dab7dd (patch) | |
| tree | 8fa7ff89169a0ee7a9e2945b76e0841bc03cff21 /drivers/usb/storage/Kconfig | |
| parent | 75c43b6ec6eb114e875e43fb151987c1a558e4f4 (diff) | |
USB: make USB_STORAGE_ONETOUCH available with PM
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>
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 7e53333be013..05cfc8473bd2 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig | |||
| @@ -123,7 +123,7 @@ config USB_STORAGE_ALAUDA | |||
| 123 | 123 | ||
| 124 | config USB_STORAGE_ONETOUCH | 124 | config USB_STORAGE_ONETOUCH |
| 125 | bool "Support OneTouch Button on Maxtor Hard Drives (EXPERIMENTAL)" | 125 | bool "Support OneTouch Button on Maxtor Hard Drives (EXPERIMENTAL)" |
| 126 | depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL && !PM | 126 | depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL |
| 127 | help | 127 | help |
| 128 | Say Y here to include additional code to support the Maxtor OneTouch | 128 | Say Y here to include additional code to support the Maxtor OneTouch |
| 129 | USB hard drive's onetouch button. | 129 | USB hard drive's onetouch button. |