diff --git a/[refs] b/[refs]
index 04163de0d3d7..6d3feb5b021e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b996ad0e9fb15ca4acc60bcd0380912117a45d13
+refs/heads/master: 6a9037887ccea92152b034edeb15d453d1a98555
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
index b2bd104b9869..ae095a498db4 100644
--- a/trunk/drivers/power/Kconfig
+++ b/trunk/drivers/power/Kconfig
@@ -51,7 +51,7 @@ config BATTERY_OLPC
 
 config BATTERY_TOSA
 	tristate "Sharp SL-6000 (tosa) battery"
-	depends on MACH_TOSA && MFD_TC6393XB
+	depends on MACH_TOSA && MFD_TC6393XB && TOUCHSCREEN_WM97XX
 	help
 	  Say Y to enable support for the battery on the Sharp Zaurus
 	  SL-6000 (tosa) models.