diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-21 11:53:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-21 11:53:30 -0500 |
| commit | 45e7715922217493f01c8238d8c9eff5c3fea5a2 (patch) | |
| tree | 57e5b34abf6c14cfcf7a4b7092b247790e64a521 /drivers | |
| parent | 85c0805a8da23c8bc0b03d70fbf11e84cb2d6df6 (diff) | |
| parent | cbc351abe3c9bcec11c712dd41bb212748fd46d3 (diff) | |
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/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 | |||
| 178 | ports of 8 GPIO pins each. | 178 | ports of 8 GPIO pins each. |
| 179 | 179 | ||
| 180 | config PINCTRL_SAMSUNG | 180 | config PINCTRL_SAMSUNG |
| 181 | bool "Samsung pinctrl driver" | 181 | bool |
| 182 | depends on OF && GPIOLIB | 182 | depends on OF && GPIOLIB |
| 183 | select PINMUX | 183 | select PINMUX |
| 184 | select PINCONF | 184 | select PINCONF |