From 4e9687d9c843dc34d368358a36f5f1610e4fbab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Va=C5=A1ut?= Date: Thu, 11 Sep 2008 19:37:32 +0100 Subject: [ARM] 5248/1: wm97xx generic battery driver This patch adds generic battery driver for wm97xx chips. Signed-off-by: Marek Vasut Acked-by: Anton Vorontsov Acked-by: Mark Brown Signed-off-by: Russell King --- drivers/power/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/power/Kconfig') diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 9ce55850271..1982f8b4278 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -56,10 +56,10 @@ config BATTERY_TOSA Say Y to enable support for the battery on the Sharp Zaurus SL-6000 (tosa) models. -config BATTERY_PALMTX - tristate "Palm T|X battery" - depends on MACH_PALMTX +config BATTERY_WM97XX + bool "WM97xx generic battery driver" + depends on TOUCHSCREEN_WM97XX help - Say Y to enable support for the battery in Palm T|X. + Say Y to enable support for battery measured by WM97xx aux port. endif # POWER_SUPPLY -- cgit v1.2.3 From 5e4c5f4c64902870552d4c15325d9e7d1a39884d Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 12 Oct 2008 12:37:16 -0700 Subject: 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 Acked-by: Mark Brown Signed-off-by: Linus Torvalds --- drivers/power/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/power/Kconfig') 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. -- cgit v1.2.3