summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorJonghwa Lee <jonghwa3.lee@samsung.com>2013-04-05 18:01:53 +0900
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:42:58 +0900
commitc47f2601c52d7c455e5f9c2c90c0c08c95a3ce1a (patch)
tree3839eaef01e5891688d53b1dadc00a0708999ea1 /drivers/power
parent591fc21ab46678bca62c418728c9cf0130821bf3 (diff)
downloadlinux-3.10-c47f2601c52d7c455e5f9c2c90c0c08c95a3ce1a.tar.gz
linux-3.10-c47f2601c52d7c455e5f9c2c90c0c08c95a3ce1a.tar.bz2
linux-3.10-c47f2601c52d7c455e5f9c2c90c0c08c95a3ce1a.zip
power: max77693: Add kernel configuation of Max77693 charger
The patch 'power: max77693: Add max77693 charger driver.' omitted CHARGER_MAX77693 kerenel configuration. Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/Kconfig7
-rw-r--r--drivers/power/Makefile1
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 7b8979c63f4..164a146827d 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -324,6 +324,13 @@ config CHARGER_MAX8998
Say Y to enable support for the battery charger control sysfs and
platform data of MAX8998/LP3974 PMICs.
+config CHARGER_MAX77693
+ tristate "Maxim MAX77693 PMIC battery charger driver"
+ depends on MFD_MAX77693 && REGULATOR_MAX77693
+ help
+ Say Y to enable support for the battery charger control sysfs and
+ platform data of MAX77693 PMICs.
+
config CHARGER_BQ2415X
tristate "TI BQ2415x battery charger driver"
depends on I2C
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index a917c98181e..ff4d1d3e30d 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -50,7 +50,6 @@ obj-$(CONFIG_CHARGER_MANAGER) += charger-manager.o
obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o
obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o
obj-$(CONFIG_CHARGER_MAX77693) += max77693_charger.o
-obj-y += max77693_charger.o
obj-$(CONFIG_CHARGER_BQ2415X) += bq2415x_charger.o
obj-$(CONFIG_POWER_AVS) += avs/
obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o