---

yaml --- r: 217396 b: refs/heads/master c: a7640bf h: refs/heads/master v: v3
git-mirror · Sep 6, 2010 · 46e2cba · 46e2cba
1 parent 52d1ce7
commit 46e2cba
Show file tree

Hide file tree

Showing 4 changed files with 394 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d98dae206daad05d794255b15bd0eb31c9294d0
+refs/heads/master: a7640bfa10c558b7cbabb4b98d6bc356d3c2ec55
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
@@ -109,6 +109,13 @@ config BATTERY_WM97XX
 	help
 	  Say Y to enable support for battery measured by WM97xx aux port.
 
+config BATTERY_BQ20Z75
+        tristate "TI BQ20z75 gas gauge"
+        depends on I2C
+        help
+         Say Y to include support for TI BQ20z75 SBS-compliant
+         gas gauge and protection IC.
+
 config BATTERY_BQ27x00
 	tristate "BQ27x00 battery driver"
 	depends on I2C

diff --git a/trunk/drivers/power/Makefile b/trunk/drivers/power/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_BATTERY_OLPC)	+= olpc_battery.o
 obj-$(CONFIG_BATTERY_TOSA)	+= tosa_battery.o
 obj-$(CONFIG_BATTERY_COLLIE)	+= collie_battery.o
 obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
+obj-$(CONFIG_BATTERY_BQ20Z75)	+= bq20z75.o
 obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o
 obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
 obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o