---

yaml --- r: 58616 b: refs/heads/master c: fe0e315 h: refs/heads/master v: v3
git-mirror · Jul 10, 2007 · d3aeb5e · d3aeb5e
1 parent 255064d
commit d3aeb5e
Show file tree

Hide file tree

Showing 4 changed files with 480 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3788ec932bfd4942831e9a5034191509a2e11924
+refs/heads/master: fe0e3153acfef4864b69932cf116eb5f38f7500c
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
@@ -28,4 +28,11 @@ config APM_POWER
 	  Say Y here to enable support APM status emulation using
 	  battery class devices.
 
+config BATTERY_DS2760
+	tristate "DS2760 battery driver (HP iPAQ & others)"
+	select W1
+	select W1_SLAVE_DS2760
+	help
+	  Say Y here to enable support for batteries with ds2760 chip.
+
 endif # POWER_SUPPLY
diff --git a/trunk/drivers/power/Makefile b/trunk/drivers/power/Makefile
@@ -16,3 +16,5 @@ obj-$(CONFIG_POWER_SUPPLY)	+= power_supply.o
 
 obj-$(CONFIG_PDA_POWER)		+= pda_power.o
 obj-$(CONFIG_APM_POWER)		+= apm_power.o
+
+obj-$(CONFIG_BATTERY_DS2760)	+= ds2760_battery.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,5 @@ obj-$(CONFIG_POWER_SUPPLY) += power_supply.o

		obj-$(CONFIG_PDA_POWER) += pda_power.o
		obj-$(CONFIG_APM_POWER) += apm_power.o

		obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o