From patchwork Wed Mar 19 19:29:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3860801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 682919F373 for ; Wed, 19 Mar 2014 19:42:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 985C0201F4 for ; Wed, 19 Mar 2014 19:42:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AC8372010E for ; Wed, 19 Mar 2014 19:42:38 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMLi-0004sh-LL; Wed, 19 Mar 2014 19:40:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMKk-0006HK-Kq; Wed, 19 Mar 2014 19:39:26 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMCx-0005aY-6z for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:31:25 +0000 Received: from wuerfel.lan (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue105) with ESMTP (Nemesis) id 0MWSYU-1WbnRK24te-00XacW; Wed, 19 Mar 2014 20:30:40 +0100 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH 34/62] ARM: pxa: select I2C_GPIO only if I2C is on Date: Wed, 19 Mar 2014 20:29:31 +0100 Message-Id: <1395257399-359545-35-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395257399-359545-1-git-send-email-arnd@arndb.de> References: <1395257399-359545-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:U/5yaKZtfLnWvwI07pyHJSg5y13yhtEsIS2WLhRUgV6 9PIaspVj8y5IlJxHjPwm/gBj3aDgFbydn/ql2emuHgWT0LTWdi iYLZqjfjFP4nYBlgh/OH3Ms7oPp5JHLkl1oC12ldwV2FIEO2EM VgAN4/6b0N5W7BoxFByUrSctkE+VWFT2M2ZAV0l6P0EwULiF1r i9sq5x1bn76YvT4UCF8jOW+s4pIiqIgtKAMNhxduDg2raSpNnQ 2buvdAJPxlJ7FHWSKEiGmf4GcWAem5+Wuvp4XpGg306Q3Ablxk Et82O/gYUWI5uT62WbcZ1SNtAHM86w2QqpDGNmeEJfggDHMmJa PbwKcogiCf4pUsq64ArVQ+UOMo2LOMGsQ6FXqLR4i X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_153123_567485_6420445D X-CRM114-Status: GOOD ( 11.48 ) X-Spam-Score: -1.9 (-) Cc: Russell King , Arnd Bergmann , Haojian Zhuang , Daniel Mack , Eric Miao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Eric Miao Cc: Russell King Cc: Haojian Zhuang Cc: Daniel Mack Acked-by: Haojian Zhuang --- arch/arm/mach-pxa/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 50f6132..8d9f4f1 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