aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-12 15:37:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-12 15:37:16 -0400
commit5e4c5f4c64902870552d4c15325d9e7d1a39884d (patch)
treeb1298e32a9feca8118e1c285cfe9803aa54b7c2d
parent807f4f8cdd5b65a8a5fcfda266c074f6a23818dd (diff)
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>
-rw-r--r--drivers/power/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 1982f8b42782..63bb57910445 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -58,7 +58,7 @@ config BATTERY_TOSA
58 58
59config BATTERY_WM97XX 59config BATTERY_WM97XX
60 bool "WM97xx generic battery driver" 60 bool "WM97xx generic battery driver"
61 depends on TOUCHSCREEN_WM97XX 61 depends on TOUCHSCREEN_WM97XX=y
62 help 62 help
63 Say Y to enable support for battery measured by WM97xx aux port. 63 Say Y to enable support for battery measured by WM97xx aux port.
64 64