From f8123c07cc3fa1597ebf3d8aa56b439ceabedbdf Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Thu, 17 Nov 2005 09:47:28 -0800
Subject: [PATCH] --- yaml --- r: 14358 b: refs/heads/master c:
 c9d00fc148b210aa8cf388d6e1eac187a0e855a6 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/storage/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eb46166bd1c8..9f3f1528c425 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0ce84d5539de88a1001f9aa3deeaa20fde3d152
+refs/heads/master: c9d00fc148b210aa8cf388d6e1eac187a0e855a6
diff --git a/trunk/drivers/usb/storage/Kconfig b/trunk/drivers/usb/storage/Kconfig
index 1a9679f76f5a..c41d64dbb0f0 100644
--- a/trunk/drivers/usb/storage/Kconfig
+++ b/trunk/drivers/usb/storage/Kconfig
@@ -115,7 +115,7 @@ config USB_STORAGE_JUMPSHOT
 
 config USB_STORAGE_ONETOUCH
 	bool "Support OneTouch Button on Maxtor Hard Drives (EXPERIMENTAL)"
-	depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL
+	depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL && !PM
 	help
 	  Say Y here to include additional code to support the Maxtor OneTouch
 	  USB hard drive's onetouch button.