---

yaml --- r: 252071 b: refs/heads/master c: 275ac74 h: refs/heads/master i: 252069: 191d586 252067: 9105a2b 252063: 963ef04 v: v3
git-mirror · May 27, 2011 · 2cc1292 · 2cc1292
1 parent fec155a
commit 2cc1292
Show file tree

Hide file tree

Showing 9 changed files with 1,223 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 963bb101010169b9bb32b5c21af785e2f9abdaf3
+refs/heads/master: 275ac74629c4d8ec430d7edecb16d936f46a47c5
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
@@ -68,6 +68,13 @@ config BATTERY_DS2760
 	help
 	  Say Y here to enable support for batteries with ds2760 chip.
 
+config BATTERY_DS2780
+	tristate "DS2780 battery driver"
+	select W1
+	select W1_SLAVE_DS2780
+	help
+	  Say Y here to enable support for batteries with ds2780 chip.
+
 config BATTERY_DS2782
 	tristate "DS2782/DS2786 standalone gas-gauge"
 	depends on I2C

diff --git a/trunk/drivers/power/Makefile b/trunk/drivers/power/Makefile
@@ -15,6 +15,7 @@ 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_DS2782)	+= ds2782_battery.o
 obj-$(CONFIG_BATTERY_PMU)	+= pmu_battery.o
 obj-$(CONFIG_BATTERY_OLPC)	+= olpc_battery.o