Merge branch 'platform_battery-2.6.34' into om-gta02-2.6.34
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 17 May 2010 23:04:36 +0000 (01:04 +0200)
committerLars-Peter Clausen <lars@metafoo.de>
Mon, 17 May 2010 23:04:36 +0000 (01:04 +0200)
Conflicts:

drivers/power/Kconfig
drivers/power/Makefile

1  2 
drivers/power/Kconfig
drivers/power/Makefile

@@@ -131,16 -131,10 +131,22 @@@ config CHARGER_PCF5063
        help
         Say Y to include support for NXP PCF50633 Main Battery Charger.
  
 +config BATTERY_BQ27000_HDQ
 +      tristate "BQ27000 HDQ battery monitor driver"
 +      help
 +        Say Y to enable support for the battery on the Neo Freerunner
 +
 +config HDQ_GPIO_BITBANG
 +      bool "Generic gpio based HDQ bitbang"
 +      help
 +        Say Y to enable supoort for generic gpio based HDQ bitbang driver.
 +        This can not be built as a module.
 +
+ config BATTERY_PLATFORM
+       tristate "Platform battery driver"
+       help
+         Say Y here to include support for battery driver that gets all
+         information from platform functions.
  endif # POWER_SUPPLY
 +
@@@ -32,6 -32,4 +32,7 @@@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x0
  obj-$(CONFIG_BATTERY_DA9030)  += da9030_battery.o
  obj-$(CONFIG_BATTERY_MAX17040)        += max17040_battery.o
  obj-$(CONFIG_CHARGER_PCF50633)        += pcf50633-charger.o
 +obj-$(CONFIG_BATTERY_BQ27000_HDQ)     += bq27000_battery.o
+ obj-$(CONFIG_BATTERY_PLATFORM)        += platform_battery.o
 +
 +obj-$(CONFIG_HDQ_GPIO_BITBANG)  += hdq.o