git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/battery-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
power
/
Makefile
diff --git
a/drivers/power/Makefile
b/drivers/power/Makefile
index 705675ae9f7c996d83d610d5ac4c31e2684140d2..10143aaf4ee3b40ca636e0a63f55ac83e7bf7720 100644
(file)
--- a/
drivers/power/Makefile
+++ b/
drivers/power/Makefile
@@
-35,4
+35,5
@@
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