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 <[email protected]>
Acked-by: Mark Brown <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 1982f8b4278218997e3a73fb3724c2c86d36c3b6..63bb579104452f0c8228e7fbbf5bccedcb37f8f6 100644 (file)
--- 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.