From: Anton Vorontsov <anton@enomsg.org>
Date: Sun, 3 Feb 2013 03:25:57 +0000 (-0800)
Subject: Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=58a1c154d449aae97a8ecad67ddbfd4024ac8446;p=deliverable%2Flinux.git

Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500

Pull a huge ab8500/pm2301 pile of changes from Lee Jones. Lee did an
awesome job cleaning this stuff up and thus brought ab8500 Stericsson's
development tree much closer to the mainline. Even more changes to come,
though.

Conflicts:
	drivers/power/Kconfig
---

58a1c154d449aae97a8ecad67ddbfd4024ac8446
diff --cc drivers/power/Kconfig
index 1ae51551c9ff,4811b59ba730..1e4719790a94
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -346,12 -346,13 +346,19 @@@ config AB8500_B
  	help
  	  Say Y to include support for AB8500 battery management.
  
 +config BATTERY_GOLDFISH
 +	tristate "Goldfish battery driver"
 +	help
 +	  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