KARO: cleanup after merge of Freescale 3.10.17 stuff

[karo-tx-linux.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 5b5a75d1d2005622271de5ff3532ce38457de575..ba6975123071984b88195d3acbce7a6d5e79d8f7 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -276,14 +276,6 @@ config CHARGER_MAX8903
          pins based on the status of charger connections with interrupt
          handlers.
 
-config SABRESD_MAX8903
-       tristate "Sabresd Board Battery DC-DC Charger for USB and Adapter Power"
-       depends on GENERIC_HARDIRQS && TOUCHSCREEN_MAX11801
-       help
-         Say Y to enable support for the MAX8903 DC-DC charger and sysfs on
-         sabresd board.The driver supports controlling charger and battery
-         based on the status of charger connections with interrupt handlers.
-
 config CHARGER_TWL4030
        tristate "OMAP TWL4030 BCI charger driver"
        depends on TWL4030_CORE
@@ -397,12 +389,6 @@ config BATTERY_GOLDFISH
          Say Y to enable support for the battery and AC power in the
          Goldfish emulator.
 
-config IMX6_USB_CHARGER
-       bool "Freescale imx6 USB Charger"
-       depends on SOC_IMX6Q || SOC_IMX6SL
-       help
-         Say Y to enable Freescale imx6 USB Charger Detect.
-
 source "drivers/power/reset/Kconfig"
 
 endif # POWER_SUPPLY