mirror of
https://github.com/torvalds/linux.git
synced 2024-11-30 16:11:38 +00:00
919c840167
- A quite complex ab8500 charger driver, submitted by
Arun Murthy @ ST-Ericsson;
- Summit Microelectronics SMB347 Battery Charger, submitted by
Bruce E. Robertson and Alan Cox @ Intel.
And that's all.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iQIcBAABAgAGBQJPdhj7AAoJEGgI9fZJve1bSKEQAKzKXPwqpBREXzS888YWzb34
0r3Bly+F8eSRTjclbEEvEOVVCjxKOFpow5lN+eAkRNAMLDBcMamfBTR+rpoYb822
d7R4Hy/stVnmD5nul0WMezZ0OZf6qRy8kHazmvb63Jk37ykof52TqoEInKdHL/ww
afUNfCnAFAbZkjxEr/9MwpM+nzYKdlGIoQlu9CJLARJiT9CyICjgHG48MGmyxOws
1LPha40jXuKLoyE+6nvG1Ji71NzZlFaVuFpzk75kjsWoB78zkRsMSv+zboHRz3QP
PI+uS54auIkGhqeIeEuuSzPZx+1K2Fr2/qyut3tqM8AejBE4kETiBAy0b0BREBSd
NqA4/Yw24c8xglIFP6OlNjHnLgCsExfHATzqzML2El/dXG8P2ggEayZzDh9bmsuU
ZNKOmHZYgEj2eEorJcmlfZ23rJwlxuspl1m2nH2WEnqw6Z6TnskK4N1JSNlpGRPU
j+iHbTPA04hultQkzNHCdPRR/jK1IC5eGdwc612QgxOhZPkvhmW92e8EOVz/3E3X
TqKXfBiKxKtkIncLPYFh7oeZINKnlqZrXsYrHhxhlm9UstGOqfEIqbCGqlf0Q4P1
WOhIQe1cP/JpB9T58e3mLF2dQIGScTqzQCRSW6/m+3HmDwZb8JyUQRw5188s3yJr
umrBS5hqS+z3bISWrcGi
=Y8fe
-----END PGP SIGNATURE-----
Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6
Pull battery updates from Anton Vorontsov:
"Various small bugfixes and enhancements, plus two new drivers:
- A quite complex ab8500 charger driver, submitted by Arun Murthy @
ST-Ericsson;
- Summit Microelectronics SMB347 Battery Charger, submitted by Bruce
E Robertson and Alan Cox @ Intel.
And that's all."
* tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6: (36 commits)
max17042_battery: Clean up interrupt handling
Revert "max8998_charger: Include linux/module.h just once"
ab8500_fg: Fix some build warnings on x86_64
max17042_battery: Fix CHARGE_FULL representation.
max8998_charger: Include linux/module.h just once
power_supply: Convert i2c drivers to module_i2c_driver
lp8727_charger: Add MODULE_DEVICE_TABLE
charger-manager: Simplify charger_get_property(), get rid of a warning
charger-manager: Clean up for better readability
da9052-battery: Convert to use module_platform_driver
da9052-battery: Fix a memory leak when unload the module
da9052-battery: Add missing platform_set_drvdata
ab8500: Turn unneeded global symbols into local ones
ab8500_fg: Fix copy-paste error
ab8500_fg: Get rid of 'struct battery_type'
ab8500_fg: Get rid of 'struct v_to_cap'
ab8500_btemp: Get rid of 'enum adc_therm'
ab8500_charger: Convert to the new USB OTG calls
ab8500-btemp: AB8500 battery temperature driver
ab8500-fg: A8500 fuel gauge driver
...
47 lines
2.0 KiB
Makefile
47 lines
2.0 KiB
Makefile
ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG
|
|
|
|
power_supply-y := power_supply_core.o
|
|
power_supply-$(CONFIG_SYSFS) += power_supply_sysfs.o
|
|
power_supply-$(CONFIG_LEDS_TRIGGERS) += power_supply_leds.o
|
|
|
|
obj-$(CONFIG_POWER_SUPPLY) += power_supply.o
|
|
|
|
obj-$(CONFIG_PDA_POWER) += pda_power.o
|
|
obj-$(CONFIG_APM_POWER) += apm_power.o
|
|
obj-$(CONFIG_MAX8925_POWER) += max8925_power.o
|
|
obj-$(CONFIG_WM831X_BACKUP) += wm831x_backup.o
|
|
obj-$(CONFIG_WM831X_POWER) += wm831x_power.o
|
|
obj-$(CONFIG_WM8350_POWER) += wm8350_power.o
|
|
obj-$(CONFIG_TEST_POWER) += test_power.o
|
|
|
|
obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o
|
|
obj-$(CONFIG_BATTERY_DS2780) += ds2780_battery.o
|
|
obj-$(CONFIG_BATTERY_DS2781) += ds2781_battery.o
|
|
obj-$(CONFIG_BATTERY_DS2782) += ds2782_battery.o
|
|
obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o
|
|
obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o
|
|
obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o
|
|
obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o
|
|
obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o
|
|
obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o
|
|
obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o
|
|
obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o
|
|
obj-$(CONFIG_BATTERY_DA9052) += da9052-battery.o
|
|
obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
|
|
obj-$(CONFIG_BATTERY_MAX17042) += max17042_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
|
|
obj-$(CONFIG_AB8500_BM) += ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o
|
|
obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o
|
|
obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o
|
|
obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o
|
|
obj-$(CONFIG_CHARGER_LP8727) += lp8727_charger.o
|
|
obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o
|
|
obj-$(CONFIG_CHARGER_MANAGER) += charger-manager.o
|
|
obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o
|
|
obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o
|
|
obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o
|