Merge remote-tracking branch 'pinctrl/for-next'

[karo-tx-linux.git] / arch / blackfin / Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index eb382aedd9a232c9d85173356bf4ed44d33fb6b5..e887b57c3176705d90beeebcc39123836f5eff1b 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -52,6 +52,9 @@ config GENERIC_BUG
 config ZONE_DMA
        def_bool y
 
+config GENERIC_GPIO
+       def_bool y
+
 config FORCE_MAX_ZONEORDER
        int
        default "14"
@@ -317,6 +320,14 @@ config BF53x
        depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537)
        default y
 
+config GPIO_ADI
+       def_bool y
+       depends on (BF51x || BF52x || BF53x || BF538 || BF539 || BF561)
+
+config PINCTRL
+       def_bool y
+       depends on BF54x || BF60x
+
 config MEM_MT48LC64M4A2FB_7E
        bool
        depends on (BFIN533_STAMP)