summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-02-04 23:57:45 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-24 21:16:34 -0700
commit5ddeac117f869c0da85e41e89dd5ed1199dab7dd (patch)
tree8fa7ff89169a0ee7a9e2945b76e0841bc03cff21
parent75c43b6ec6eb114e875e43fb151987c1a558e4f4 (diff)
downloadlinux-3.10-5ddeac117f869c0da85e41e89dd5ed1199dab7dd.tar.gz
linux-3.10-5ddeac117f869c0da85e41e89dd5ed1199dab7dd.tar.bz2
linux-3.10-5ddeac117f869c0da85e41e89dd5ed1199dab7dd.zip
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>
-rw-r--r--drivers/usb/storage/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 7e53333be01..05cfc8473bd 100644
--- 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.