Merge tag 'powerpc-5.2-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/power...

[linux-2.6-microblaze.git] / drivers / extcon / Kconfig

diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index 540e8cd..de06faf 100644 (file)
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -30,7 +30,7 @@ config EXTCON_ARIZONA
 
 config EXTCON_AXP288
        tristate "X-Power AXP288 EXTCON support"
-       depends on MFD_AXP20X && USB_SUPPORT && X86
+       depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI
        select USB_ROLE_SWITCH
        help
          Say Y here to enable support for USB peripheral detection
@@ -60,6 +60,13 @@ config EXTCON_INTEL_CHT_WC
          Say Y here to enable extcon support for charger detection / control
          on the Intel Cherrytrail Whiskey Cove PMIC.
 
+config EXTCON_INTEL_MRFLD
+       tristate "Intel Merrifield Basin Cove PMIC extcon driver"
+       depends on INTEL_SOC_PMIC_MRFLD
+       help
+         Say Y here to enable extcon support for charger detection / control
+         on the Intel Merrifield Basin Cove PMIC.
+
 config EXTCON_MAX14577
        tristate "Maxim MAX14577/77836 EXTCON Support"
        depends on MFD_MAX14577