diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-12-07 17:02:47 +0000 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-12-07 17:02:47 +0000 |
commit | 7730cba2a50332c194f50a58b86359ea39a82bd1 (patch) | |
tree | 64c8d7228da1454c02288068e57a9c61f8b0acd0 /drivers/pinctrl/Kconfig | |
parent | c20151dff8a6d503c0d0cc4387c33a618cdabcb7 (diff) | |
parent | b69f0859dc8e633c5d8c06845811588fe17e68b3 (diff) |
Merge tag 'v3.7-rc8' into spi/next
Linux 3.7-rc8
Diffstat (limited to 'drivers/pinctrl/Kconfig')
-rw-r--r-- | drivers/pinctrl/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index d96caefd914a..aeecf0f72cad 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -178,7 +178,7 @@ config PINCTRL_COH901 ports of 8 GPIO pins each. config PINCTRL_SAMSUNG - bool "Samsung pinctrl driver" + bool depends on OF && GPIOLIB select PINMUX select PINCONF |