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 3bd2ed86fea..e24485f3538 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -116,12 +116,12 @@ config BATTERY_WM97XX help Say Y to enable support for battery measured by WM97xx aux port. -config BATTERY_BQ20Z75 - tristate "TI BQ20z75 gas gauge" +config BATTERY_SBS + tristate "SBS Compliant gas gauge" depends on I2C help - Say Y to include support for TI BQ20z75 SBS-compliant - gas gauge and protection IC. + Say Y to include support for SBS battery driver for SBS-compliant + gas gauges. config BATTERY_BQ27x00 tristate "BQ27x00 battery driver" diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 9a78b1dd570..9c3bbf76a2b 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -22,7 +22,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_SBS) += sbs-battery.o obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o diff --git a/drivers/power/bq20z75.c b/drivers/power/sbs-battery.c index ce95ff79101..ce95ff79101 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 1398eb004e8..1398eb004e8 100644 --- a/include/linux/power/bq20z75.h +++ b/include/linux/power/sbs-battery.h |