diff options
| author | Laurent Pinchart | 2013-05-31 05:00:27 +0200 |
|---|---|---|
| committer | Simon Horman | 2013-06-05 10:18:21 +0200 |
| commit | 2cd3c92738722d4b510830e948ffad9c7f60adf8 (patch) | |
| tree | fedea2d931b0e3e16487e43412dd4336ac3fdbe6 /arch/arm/Kconfig | |
| parent | pinctrl: r8a7790: add pinmux data for MMCIF and SDHI interfaces (diff) | |
| download | kernel-qcow2-linux-2cd3c92738722d4b510830e948ffad9c7f60adf8.tar.gz kernel-qcow2-linux-2cd3c92738722d4b510830e948ffad9c7f60adf8.tar.xz kernel-qcow2-linux-2cd3c92738722d4b510830e948ffad9c7f60adf8.zip | |
Revert "ARM: shmobile: Disallow PINCTRL without GPIOLIB"
GPIOLIB dependency handling was added to the PINCTRL core by
commit 2afe8229687ec24cbc07e78449a588bb8b68f858
Author: Haojian Zhuang <haojian.zhuang@linaro.org>
Date: Thu Mar 28 07:34:19 2013 +0800
pinctrl: core: add dependence of GPIOLIB
There is not need to handle that dependency at the SH Mobile level
anymore. Revert
commit 6722f6cb763203cab775297b6e9d00834af0d6d7
Author: Magnus Damm <damm@opensource.se>
Date: Mon Mar 18 22:58:18 2013 +0900
ARM: shmobile: Disallow PINCTRL without GPIOLIB
Modify mach-shmobile to only select PINCTRL in case of
ARCH_WANT_OPTIONAL_GPIOLIB is set.
This fixes a build error triggered when adding a new SoC
lacking GPIO software support (ARCH_WANT_OPTIONAL_GPIOLIB=n):
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 49d993cee512..dfb4fee1f552 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -645,7 +645,7 @@ config ARCH_SHMOBILE select MULTI_IRQ_HANDLER select NEED_MACH_MEMORY_H select NO_IOPORT - select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB + select PINCTRL select PM_GENERIC_DOMAINS if PM select SPARSE_IRQ help |