phyus/linux-vybrid_public

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>

Laurent Pinchart 12 years ago

parent

066f0d6eb7

commit

2cd3c92738

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
arch/arm/Kconfig
							 
								View File
							
				@@ -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

Revert "ARM: shmobile: Disallow PINCTRL without GPIOLIB"

+ 1 - 1 arch/arm/Kconfig View File

+ 1 - 1
arch/arm/Kconfig
View File