From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Aug 2010 16:58:33 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=16bb85bc12e7d0b066b1471185f3889cb1ceb382;p=linux-edison.git

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  intel_mid_battery: Fix battery scaling
  intel_mid_battery: Fix the argument order to intel_scu_ipc_command
  olpc_battery: Fix build failure caused by sysfs changes
  Add s3c-adc-battery driver
  Intel MID platform battery driver

Fix up trivial conflicts (battery drivers added from different branches)
in drivers/power/{Kconfig,Makefile}
---

16bb85bc12e7d0b066b1471185f3889cb1ceb382
diff --cc drivers/power/Kconfig
index 1e5506be39b,d1d3c7006ea..07343568a12
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -142,15 -148,11 +148,22 @@@ config CHARGER_PCF5063
  	help
  	 Say Y to include support for NXP PCF50633 Main Battery Charger.
  
 +config BATTERY_JZ4740
 +	tristate "Ingenic JZ4740 battery"
 +	depends on MACH_JZ4740
 +	depends on MFD_JZ4740_ADC
 +	help
 +	  Say Y to enable support for the battery on Ingenic JZ4740 based
 +	  boards.
 +
 +	  This driver can be build as a module. If so, the module will be
 +	  called jz4740-battery.
 +
+ config BATTERY_INTEL_MID
+ 	tristate "Battery driver for Intel MID platforms"
+ 	depends on INTEL_SCU_IPC && SPI
+ 	help
+ 	  Say Y here to enable the battery driver on Intel MID
+ 	  platforms.
+ 
  endif # POWER_SUPPLY
diff --cc drivers/power/Makefile
index cf95009d9bc,705675ae9f7..10143aaf4ee
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@@ -33,5 -33,6 +33,7 @@@ obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x0
  obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
  obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
  obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o
+ obj-$(CONFIG_BATTERY_S3C_ADC)	+= s3c_adc_battery.o
  obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
 +obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o
+ obj-$(CONFIG_BATTERY_INTEL_MID)	+= intel_mid_battery.o