---

yaml --- r: 296097 b: refs/heads/master c: 8a16a70 h: refs/heads/master i: 296095: 126c900 v: v3
git-mirror · Mar 7, 2012 · c9eed03 · c9eed03
1 parent 3ac366b
commit c9eed03
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 196 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6967cca8b431a181d3a02eee81f0c9f8b5e9e75a
+refs/heads/master: 8a16a701ad787b6db2949766341c5ad1b551de9f
diff --git a/trunk/drivers/regulator/Kconfig b/trunk/drivers/regulator/Kconfig
@@ -74,14 +74,6 @@ config REGULATOR_GPIO
 	  and the platform has to provide a mapping of GPIO-states
 	  to target volts/amps.
 
-config REGULATOR_BQ24022
-	tristate "TI bq24022 Dual Input 1-Cell Li-Ion Charger IC"
-	help
-	  This driver controls a TI bq24022 Charger attached via
-	  GPIOs. The provided current regulator can enable/disable
-	  charging select between 100 mA and 500 mA charging current
-	  limit.
-
 config REGULATOR_MAX1586
 	tristate "Maxim 1586/1587 voltage regulator"
 	depends on I2C

diff --git a/trunk/drivers/regulator/Makefile b/trunk/drivers/regulator/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o
 
 obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o
 obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
-obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
 obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
 obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o
 obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o

diff --git a/trunk/drivers/regulator/bq24022.c b/trunk/drivers/regulator/bq24022.c
diff --git a/trunk/include/linux/regulator/bq24022.h b/trunk/include/linux/regulator/bq24022.h