Commit 45e77159 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pinctrl-for-v3.7-late' of...

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
parents 85c0805a cbc351ab
...@@ -178,7 +178,7 @@ config PINCTRL_COH901 ...@@ -178,7 +178,7 @@ config PINCTRL_COH901
ports of 8 GPIO pins each. ports of 8 GPIO pins each.
config PINCTRL_SAMSUNG config PINCTRL_SAMSUNG
bool "Samsung pinctrl driver" bool
depends on OF && GPIOLIB depends on OF && GPIOLIB
select PINMUX select PINMUX
select PINCONF select PINCONF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment