diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:58:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:58:33 -0400 |
| commit | 16bb85bc12e7d0b066b1471185f3889cb1ceb382 (patch) | |
| tree | 88f7bb3ff052ea0e68d5416853d8fd68a508d8e7 /drivers/power/Makefile | |
| parent | 4936a3b90d79dd8775c6ac23c2cf2dcebe29abde (diff) | |
| parent | f59f5bcb605f40d418aceb6f6047069435ffac72 (diff) | |
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}
Diffstat (limited to 'drivers/power/Makefile')
| -rw-r--r-- | drivers/power/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index cf95009d9bcd..10143aaf4ee3 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile | |||
| @@ -33,5 +33,7 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o | |||
| 33 | obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o | 33 | obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o |
| 34 | obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o | 34 | obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o |
| 35 | obj-$(CONFIG_BATTERY_Z2) += z2_battery.o | 35 | obj-$(CONFIG_BATTERY_Z2) += z2_battery.o |
| 36 | obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o | ||
| 36 | obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o | 37 | obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o |
| 37 | obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o | 38 | obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o |
| 39 | obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o | ||