From a0e2535835d4d6032ede0f78473cfb4723e10403 Mon Sep 17 00:00:00 2001
From: Marcus Cooper <marcus.xm.cooper@stericsson.com>
Date: Fri, 10 Aug 2012 12:59:06 +0200
Subject: [PATCH] --- yaml --- r: 367471 b: refs/heads/master c:
 405fea1c6691eb8259f2ca879c9348a4cf5d898d h: refs/heads/master i:   367469:
 a535e5b5b00daf4cca524dd43f7133c7364f759b   367467:
 517af80dd23833324d188cd43d2f498563916485   367463:
 bc11d0b7430aa85cfafac45cd8776ca6f56f3012   367455:
 ad732e7e434bb49d9fc43f1c989308ebe8144b72 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/power/Kconfig          | 7 -------
 trunk/drivers/power/Makefile         | 3 +--
 trunk/drivers/power/ab8500_charger.c | 6 +++---
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 9ac5e7bb8d9d..43ab85f41f53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4337660d06945c9772182b5b8e72443ae3e475d
+refs/heads/master: 405fea1c6691eb8259f2ca879c9348a4cf5d898d
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
index 9e00c389e777..07e1a8f8d03e 100644
--- a/trunk/drivers/power/Kconfig
+++ b/trunk/drivers/power/Kconfig
@@ -353,13 +353,6 @@ config BATTERY_GOLDFISH
 	  Say Y to enable support for the battery and AC power in the
 	  Goldfish emulator.
 
-config CHARGER_PM2301
-	bool "PM2301 Battery Charger Driver"
-	depends on AB8500_BM
-	help
-	  Say Y to include support for PM2301 charger driver.
-	  Depends on AB8500 battery management core.
-
 source "drivers/power/reset/Kconfig"
 
 endif # POWER_SUPPLY
diff --git a/trunk/drivers/power/Makefile b/trunk/drivers/power/Makefile
index 3f66436af45c..eb520ea74970 100644
--- a/trunk/drivers/power/Makefile
+++ b/trunk/drivers/power/Makefile
@@ -39,7 +39,7 @@ obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
 obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o
 obj-$(CONFIG_BATTERY_INTEL_MID)	+= intel_mid_battery.o
 obj-$(CONFIG_BATTERY_RX51)	+= rx51_battery.o
-obj-$(CONFIG_AB8500_BM)		+= ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o
+obj-$(CONFIG_AB8500_BM)		+= ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o pm2301_charger.o
 obj-$(CONFIG_CHARGER_ISP1704)	+= isp1704_charger.o
 obj-$(CONFIG_CHARGER_MAX8903)	+= max8903_charger.o
 obj-$(CONFIG_CHARGER_TWL4030)	+= twl4030_charger.o
@@ -47,7 +47,6 @@ obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_charger.o
 obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o
 obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o
 obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
-obj-$(CONFIG_CHARGER_PM2301)	+= pm2301_charger.o
 obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o
 obj-$(CONFIG_CHARGER_MAX8998)	+= max8998_charger.o
 obj-$(CONFIG_CHARGER_BQ2415X)	+= bq2415x_charger.o
diff --git a/trunk/drivers/power/ab8500_charger.c b/trunk/drivers/power/ab8500_charger.c
index b5c7a3975024..6fea4fdf8701 100644
--- a/trunk/drivers/power/ab8500_charger.c
+++ b/trunk/drivers/power/ab8500_charger.c
@@ -3387,10 +3387,10 @@ static int ab8500_charger_remove(struct platform_device *pdev)
 	flush_scheduled_work();
 	if (di->usb_chg.enabled)
 		power_supply_unregister(&di->usb_chg.psy);
-#if !defined(CONFIG_CHARGER_PM2301)
-	if (di->ac_chg.enabled)
+
+	if (di->ac_chg.enabled && !di->ac_chg.external)
 		power_supply_unregister(&di->ac_chg.psy);
-#endif
+
 	platform_set_drvdata(pdev, NULL);
 
 	return 0;