diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/power/Kconfig | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/power/Kconfig')
-rw-r--r-- | drivers/power/Kconfig | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 9474894..5715075 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -241,12 +241,6 @@ config BATTERY_SAMSUNG help Say Y to enable support for batteries with samsung chip. -config BATTERY_SAMSUNG_S2PLUS - tristate "Fake battery driver for samsung s2plus boards" - depends on PLAT_SAMSUNG - help - Say Y to enable support for batteries with s2plus board. - config CHARGER_MAX8997 tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver" depends on MFD_MAX8997 && REGULATOR_MAX8997 @@ -282,14 +276,6 @@ config CHARGER_MAX8922_U1 Say Y here to enable support for the battery charger in the Maxim MAX8922 Charger IC. -config CHARGER_MAX8922_S2PLUS - tristate "MAX8922 battery charger support for Samsung Galaxy S2 ICS upgrade" - depends on PLAT_SAMSUNG - default n - help - Say Y here to enable support for the battery charger in the Maxim - MAX8922 Charger IC. - config BATTERY_MAX17042_FUELGAUGE_U1 tristate "Maxim MAX17042/8997/8966 Fuel Gauge for Samsung Galaxy S2 ICS upgrade" depends on I2C |