From patchwork Wed Mar 19 19:29:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3861021 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 032299F334 for ; Wed, 19 Mar 2014 20:11:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34BCC201FA for ; Wed, 19 Mar 2014 20:11:43 +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 1DC3B201F5 for ; Wed, 19 Mar 2014 20:11:41 +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 1WQMFg-0000ka-7A; Wed, 19 Mar 2014 19:34:14 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMEi-0005nO-Qq; Wed, 19 Mar 2014 19:33:12 +0000 Received: from moutng.kundenserver.de ([212.227.17.13]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMCc-0005Vv-CB for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:31:10 +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 0Lsi1h-1X5eHl23GD-012GP1; Wed, 19 Mar 2014 20:30:36 +0100 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH 18/62] ARM: ks8695/og: make PCI setup conditional Date: Wed, 19 Mar 2014 20:29:15 +0100 Message-Id: <1395257399-359545-19-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:VlilRycP/5kjsvJkK1fXDVxmlm4oHVBQPcWc7RERBlp 02QtmCjBD2/Nfykz6La/xBXVkDYc57eI3SpDgo2PP2eG/URI4s 84i67tff0/C1pLgnOzqL6+d1NJgPZGOqve6TFpoPa/cLue0bBJ mY1ak/KCW3pyp+dxN0LeRxSvKt11QmLnk5zLKP5BdmhWgdEd5l fp8+Kv82Nr/0JiBS70uGBULwI+oJ3e1p2oW+vBV31d/AwHY2i3 psGi+CbSwJDgEx2WeCvVJ4DLyh2c0pSo0GVn6KhkpXamlzumEx sVp4367mhYYUeBr1WAuI3nWf1f4iOdZeAMB7QaOFl/RrwlS7eP jMzrt5+xaRnV7BFsytkFC8WKrdw3Gce7nO1rk5vbm X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_153102_861673_F3AEA960 X-CRM114-Status: GOOD ( 10.78 ) X-Spam-Score: -1.9 (-) Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Greg Ungerer 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 'og' machine tries to always initialized the PCI code, but that may be disabled in Kconfig, leading to a build error. This patch changes the code to use the same Kconfig symbol to decide about calling the ks8695_init_pci function at build time that we use to decide about building the ks8695 PCI support. Signed-off-by: Arnd Bergmann Cc: Greg Ungerer Acked-by: Greg Ungerer --- arch/arm/mach-ks8695/board-og.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-ks8695/board-og.c b/arch/arm/mach-ks8695/board-og.c index 002bc61..f265816 100644 --- a/arch/arm/mach-ks8695/board-og.c +++ b/arch/arm/mach-ks8695/board-og.c @@ -44,7 +44,8 @@ static void __init og_register_pci(void) if (machine_is_im4004()) ks8695_gpio_interrupt(KS8695_GPIO_1, IRQ_TYPE_LEVEL_LOW); - ks8695_init_pci(&og_pci); + if (IS_ENABLED(CONFIG_PCI)) + ks8695_init_pci(&og_pci); } /*