diff options
-rw-r--r-- | drivers/power/Kconfig | 8 | ||||
-rw-r--r-- | drivers/power/Makefile | 2 | ||||
-rw-r--r-- | drivers/power/sbs-battery.c (renamed from drivers/power/bq20z75.c) | 0 | ||||
-rw-r--r-- | include/linux/power/sbs-battery.h (renamed from include/linux/power/bq20z75.h) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 3bd2ed86fea2..e24485f35384 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
@@ -116,12 +116,12 @@ config BATTERY_WM97XX | |||
116 | help | 116 | help |
117 | Say Y to enable support for battery measured by WM97xx aux port. | 117 | Say Y to enable support for battery measured by WM97xx aux port. |
118 | 118 | ||
119 | config BATTERY_BQ20Z75 | 119 | config BATTERY_SBS |
120 | tristate "TI BQ20z75 gas gauge" | 120 | tristate "SBS Compliant gas gauge" |
121 | depends on I2C | 121 | depends on I2C |
122 | help | 122 | help |
123 | Say Y to include support for TI BQ20z75 SBS-compliant | 123 | Say Y to include support for SBS battery driver for SBS-compliant |
124 | gas gauge and protection IC. | 124 | gas gauges. |
125 | 125 | ||
126 | config BATTERY_BQ27x00 | 126 | config BATTERY_BQ27x00 |
127 | tristate "BQ27x00 battery driver" | 127 | tristate "BQ27x00 battery driver" |
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 9a78b1dd570b..9c3bbf76a2bf 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile | |||
@@ -22,7 +22,7 @@ obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o | |||
22 | obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o | 22 | obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o |
23 | obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o | 23 | obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o |
24 | obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o | 24 | obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o |
25 | obj-$(CONFIG_BATTERY_BQ20Z75) += bq20z75.o | 25 | obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o |
26 | obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o | 26 | obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o |
27 | obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o | 27 | obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o |
28 | obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o | 28 | obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o |
diff --git a/drivers/power/bq20z75.c b/drivers/power/sbs-battery.c index ce95ff791016..ce95ff791016 100644 --- a/drivers/power/bq20z75.c +++ b/drivers/power/sbs-battery.c | |||
diff --git a/include/linux/power/bq20z75.h b/include/linux/power/sbs-battery.h index 1398eb004e83..1398eb004e83 100644 --- a/include/linux/power/bq20z75.h +++ b/include/linux/power/sbs-battery.h | |||