diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-08 01:00:44 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-08 01:00:44 (GMT) |
| commit | 95436adaa0f97e42e89978690c3a79cf9ef0d486 (patch) | |
| tree | c50177a65861f82d00a624640acf6d39875ea6da /drivers/pinctrl/Kconfig | |
| parent | a04521ab8071a46dff5d618c98b37427a8aab9f4 (diff) | |
| parent | 228f1ce9b8e9e63c3ffc1b03b64d77277cacb89f (diff) | |
| download | linux-fsl-qoriq-95436adaa0f97e42e89978690c3a79cf9ef0d486.tar.xz | |
Merge tag 'pinctrl-for-v3.8-late' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull late pinctrl fixes from Linus Walleij:
"Two patches appeared as of late, one was completely news to me, the
other one was rotated in -next for the next merge window but turned
out to be a showstopper.
- Exynos Kconfig fixup
- SIRF DT translation bug"
* tag 'pinctrl-for-v3.8-late' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: sirf: replace of_gpio_simple_xlate by sirf specific of_xlate
pinctrl: exynos: change PINCTRL_EXYNOS option
Diffstat (limited to 'drivers/pinctrl/Kconfig')
| -rw-r--r-- | drivers/pinctrl/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index efaecef..a5f3c8c 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -184,8 +184,8 @@ config PINCTRL_SAMSUNG select PINMUX select PINCONF -config PINCTRL_EXYNOS4 - bool "Pinctrl driver data for Exynos4 SoC" +config PINCTRL_EXYNOS + bool "Pinctrl driver data for Samsung EXYNOS SoCs" depends on OF && GPIOLIB select PINCTRL_SAMSUNG |