summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-12 21:37:16 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-12 21:37:16 +0200
commit5e4c5f4c64902870552d4c15325d9e7d1a39884d (patch)
treeb1298e32a9feca8118e1c285cfe9803aa54b7c2d /drivers/power
parentMerge branch 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
downloadlinux-5e4c5f4c64902870552d4c15325d9e7d1a39884d.tar.xz
linux-5e4c5f4c64902870552d4c15325d9e7d1a39884d.zip
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>
Diffstat (limited to '')
-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
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.