Merge branches 'pm-cpufreq' and 'pm-cpuidle'

[cascardo/linux.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c6a66de..d014f22 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -67,18 +67,6 @@ config PINCTRL_AT91
        help
          Say Y here to enable the at91 pinctrl driver
 
-config PINCTRL_BAYTRAIL
-       bool "Intel Baytrail GPIO pin control"
-       depends on GPIOLIB && ACPI && X86
-       select GPIOLIB_IRQCHIP
-       help
-         driver for memory mapped GPIO functionality on Intel Baytrail
-         platforms. Supports 3 banks with 102, 28 and 44 gpios.
-         Most pins are usually muxed to some other functionality by firmware,
-         so only a small amount is available for gpio use.
-
-         Requires ACPI device enumeration code to set up a platform device.
-
 config PINCTRL_BCM2835
        bool
        select PINMUX
@@ -205,6 +193,7 @@ config PINCTRL_PALMAS
 
 source "drivers/pinctrl/berlin/Kconfig"
 source "drivers/pinctrl/freescale/Kconfig"
+source "drivers/pinctrl/intel/Kconfig"
 source "drivers/pinctrl/mvebu/Kconfig"
 source "drivers/pinctrl/nomadik/Kconfig"
 source "drivers/pinctrl/qcom/Kconfig"