summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-13 16:47:35 +0100
committerArnd Bergmann <arnd@arndb.de>2014-03-21 18:26:05 +0100
commitc7dc7d49fa8cddcc1907f94c658989583728099f (patch)
treeca304764ceddd64fb22d2a3a49bb420f0996a089
parent419606ec4d42a37a8b688bb55fee99434ad6954c (diff)
downloadop-kernel-dev-c7dc7d49fa8cddcc1907f94c658989583728099f.zip
op-kernel-dev-c7dc7d49fa8cddcc1907f94c658989583728099f.tar.gz
ARM: pxa: select I2C_GPIO only if I2C is on
The Arcom/Eurotech VIPER SBC enables the I2C_GPIO driver, but that has a dependency on I2C, and causes build failures if I2C is disabled. To keep existing configurations running while fixing the randconfig problems, this changes the logic to only enable I2C_GPIO if I2C is already enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Daniel Mack <zonque@gmail.com>
-rw-r--r--arch/arm/mach-pxa/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 2895cd9..6963dee 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -73,8 +73,7 @@ config ARCH_PXA_IDP
config ARCH_VIPER
bool "Arcom/Eurotech VIPER SBC"
select ARCOM_PCMCIA
- select HAVE_PWM
- select I2C_GPIO
+ select I2C_GPIO if I2C=y
select ISA
select PXA25x
select PXA_HAVE_ISA_IRQS
OpenPOWER on IntegriCloud