Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16bb85bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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}
parents 4936a3b9 f59f5bcb

drivers/power/Kconfig

+13 −0
Original line number Original line Diff line number Diff line
@@ -136,6 +136,12 @@ config BATTERY_Z2 
	help

	help

	  Say Y to include support for the battery on the Zipit Z2.

	  Say Y to include support for the battery on the Zipit Z2.





config BATTERY_S3C_ADC

	tristate "Battery driver for Samsung ADC based monitoring"

	depends on S3C_ADC

	help

	  Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery



config CHARGER_PCF50633

config CHARGER_PCF50633

	tristate "NXP PCF50633 MBC"

	tristate "NXP PCF50633 MBC"

	depends on MFD_PCF50633

	depends on MFD_PCF50633
@@ -153,4 +159,11 @@ config BATTERY_JZ4740 
	  This driver can be build as a module. If so, the module will be

	  This driver can be build as a module. If so, the module will be

	  called jz4740-battery.

	  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
 
endif # POWER_SUPPLY

drivers/power/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -33,5 +33,7 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o 
obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o

obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o

obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o

obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o

obj-$(CONFIG_BATTERY_Z2)	+= z2_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_CHARGER_PCF50633)	+= pcf50633-charger.o

obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o

obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o

obj-$(CONFIG_BATTERY_INTEL_MID)	+= intel_mid_battery.o

drivers/power/intel_mid_battery.c

0 → 100644
+799 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/power/olpc_battery.c

+1 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Battery driver for One Laptop Per Child board.

 * Battery driver for One Laptop Per Child board.

 *

 *

 *	Copyright © 2006  David Woodhouse <dwmw2@infradead.org>

 *	Copyright © 2006-2010  David Woodhouse <dwmw2@infradead.org>

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * it under the terms of the GNU General Public License version 2 as

drivers/power/s3c_adc_battery.c

0 → 100644
+431 −0

File added.

Preview size limit exceeded, changes collapsed.