aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-21 06:53:30 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-21 06:53:30 -1000
commit45e7715922217493f01c8238d8c9eff5c3fea5a2 (patch)
tree57e5b34abf6c14cfcf7a4b7092b247790e64a521 /drivers
parent85c0805a8da23c8bc0b03d70fbf11e84cb2d6df6 (diff)
parentcbc351abe3c9bcec11c712dd41bb212748fd46d3 (diff)
downloadvexpress-lsk-45e7715922217493f01c8238d8c9eff5c3fea5a2.tar.gz
Merge tag 'pinctrl-for-v3.7-late' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pinctrl fix from Linus Walleij: "A simple pinctrl Kconfig oneliner arriving late. Final (hopefully) oneliner for the pinctrl subsystem targeted at v3.7" * tag 'pinctrl-for-v3.7-late' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl/samsung: don't allow enabling pinctrl-samsung standalone
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pinctrl/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index d96caefd914..aeecf0f72ca 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