From 6721081b6b911a067fe6ca3d6f5534c4a11a9e59 Mon Sep 17 00:00:00 2001 From: Nithish Mahalingam Date: Thu, 17 Jun 2010 18:12:36 +0100 Subject: Intel MID platform battery driver The PMIC Battery driver provides battery charging and battery gauge functionality on Intel MID platforms. This provides the basic functions. There are some USB drivers to merge before the selection of charging between the different USB power levels can be enabled. Moved to a platform device by Alek Du. Signed-off-by: Nithish Mahalingam Signed-off-by: Alan Cox Signed-off-by: Anton Vorontsov --- drivers/power/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/power/Makefile') diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 0005080..2b9a81d 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -34,3 +34,4 @@ obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_BATTERY_Z2) += z2_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o +obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o -- cgit v1.1 From 808be4b22f47886d2279852ada3d186fc20909bc Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Sat, 17 Jul 2010 13:57:03 +0300 Subject: Add s3c-adc-battery driver s3c-adc-battery is driver for monitoring and charging battery on iPAQ H1930/H1940/RX1950. It depends on s3c-adc driver to get battery voltage and current. Signed-off-by: Vasily Khoruzhick Signed-off-by: Anton Vorontsov --- drivers/power/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/power/Makefile') diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 2b9a81d..705675a 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -33,5 +33,6 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o 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_INTEL_MID) += intel_mid_battery.o -- cgit v1.1