From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Oct 2008 19:37:16 +0000 (-0700)
Subject: Fix Kconfig dependency for WM97xx battery driver
X-Git-Tag: v2.6.28-rc1~698
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5e4c5f4c64902870552d4c15325d9e7d1a39884d;p=linux-2.6-omap-h63xx.git

Fix Kconfig dependency for WM97xx battery driver

It needs the WM97xx touchscreen driver to be compiled in, not as a
module.  And it cannot itself be a module, due to some unfortunate
interactions with platform data.

Reported-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 1982f8b4278..63bb5791044 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -58,7 +58,7 @@ config BATTERY_TOSA
 
 config BATTERY_WM97XX
 	bool "WM97xx generic battery driver"
-	depends on TOUCHSCREEN_WM97XX
+	depends on TOUCHSCREEN_WM97XX=y
 	help
 	  Say Y to enable support for battery measured by WM97xx aux port.