From 4a922dc8ab2915b61ff6adfe8e0a01069893b52b Mon Sep 17 00:00:00 2001 From: Andy Green Date: Fri, 21 Nov 2008 16:40:58 +0000 Subject: MERGE-via-balaji-tracking-balaji-updates Signed-off-by: Andy Green --- drivers/power/Kconfig | 6 ++++++ drivers/power/Makefile | 2 ++ 2 files changed, 8 insertions(+) (limited to 'drivers/power') diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 2bf15b1eb2e..64bbd27c197 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -81,5 +81,11 @@ config GTA02_HDQ on the Neo Freerunner. You probably want to select at least BATTERY_BQ27000_HDQ as well +config CHARGER_PCF50633 + tristate "Support for NXP PCF50633 MBC" + depends on MFD_PCF50633 + help + Say Y to include support for NXP PCF50633 Main Battery Charger. + endif # POWER_SUPPLY diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 56f3901d7d8..5cee08b40b5 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -27,3 +27,5 @@ obj-$(CONFIG_BATTERY_PALMTX) += palmtx_battery.o obj-$(CONFIG_BATTERY_BQ27000_HDQ) += bq27000_battery.o obj-$(CONFIG_GTA02_HDQ) += gta02_hdq.o + +obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o -- cgit v1.2.3