aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-03-18 09:58:18 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-04-01 21:58:24 -0400
commit6722f6cb763203cab775297b6e9d00834af0d6d7 (patch)
treeeb8921548769cf978ad05525e5fb16a6deb0f490
parent558f874029c904ca694a69e96b4b48c4d54686a3 (diff)
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): CC drivers/tty/vt/keyboard.o In file included from drivers/pinctrl/core.c:30:0: include/asm-generic/gpio.h: In function 'gpio_get_value_cansleep': include/asm-generic/gpio.h:270:2: error: implicit declaration of function '__gpio_get_value' include/asm-generic/gpio.h: In function 'gpio_set_value_cansleep': include/asm-generic/gpio.h:276:2: error: implicit declaration of function '__gpio_set_value' drivers/pinctrl/core.c: In function 'pinctrl_ready_for_gpio_range': drivers/pinctrl/core.c:297:9: error: implicit declaration of function 'gpio_to_chip' drivers/pinctrl/core.c:297:27: warning: initialization makes pointer from integer without a cast drivers/pinctrl/core.c:304:45: error: dereferencing pointer to incomplete type drivers/pinctrl/core.c:305:26: error: dereferencing pointer to incomplete type drivers/pinctrl/core.c:305:39: error: dereferencing pointer to incomplete type make[2]: *** [drivers/pinctrl/core.o] Error 1 make[1]: *** [drivers/pinctrl] Error 2 make[1]: *** Waiting for unfinished jobs.... LD drivers/sh/built-in.o Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5b714695b01b..b63902e7cacd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -725,7 +725,7 @@ config ARCH_SHMOBILE
725 select MULTI_IRQ_HANDLER 725 select MULTI_IRQ_HANDLER
726 select NEED_MACH_MEMORY_H 726 select NEED_MACH_MEMORY_H
727 select NO_IOPORT 727 select NO_IOPORT
728 select PINCTRL 728 select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB
729 select PM_GENERIC_DOMAINS if PM 729 select PM_GENERIC_DOMAINS if PM
730 select SPARSE_IRQ 730 select SPARSE_IRQ
731 help 731 help