From patchwork Wed Aug 14 19:50:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 2844766 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 D630D9F271 for ; Wed, 14 Aug 2013 19:51:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7A3E206C7 for ; Wed, 14 Aug 2013 19:50:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BE320206C4 for ; Wed, 14 Aug 2013 19:50:58 +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 1V9h5r-00015o-Pw; Wed, 14 Aug 2013 19:50:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9h5p-0004HC-Fu; Wed, 14 Aug 2013 19:50:53 +0000 Received: from 8bytes.org ([2a01:238:4242:f000:64f:6c43:3523:e535] helo=mail.8bytes.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9h5m-0004GT-EI for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2013 19:50:51 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.8bytes.org (Postfix) with SMTP id 2F39312AF2A for ; Wed, 14 Aug 2013 21:50:28 +0200 (CEST) Received: by mail.8bytes.org (Postfix, from userid 1000) id 01C4E12AF1A; Wed, 14 Aug 2013 21:50:26 +0200 (CEST) From: Joerg Roedel To: Russell King , Linus Walleij , Arnd Bergmann Subject: [PATCH] ARM: integrator: Make sure INTEGRATOR_AP depends on PCI Date: Wed, 14 Aug 2013 21:50:18 +0200 Message-Id: <1376509818-22163-1-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.7.9.5 X-DSPAM-Result: Whitelisted X-DSPAM-Processed: Wed Aug 14 21:50:28 2013 X-DSPAM-Confidence: 0.9990 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 520bdf8420861950848466 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130814_155050_752349_7A50496F X-CRM114-Status: GOOD ( 11.70 ) X-Spam-Score: -4.7 (----) Cc: Joerg Roedel , linux-kernel@vger.kernel.org, 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=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Add this dependency to the Kconfig file to fix the following build error when CONFIG_INTEGRATOR_AP is set but CONFIG_PCI is not: LD init/built-in.o arch/arm/mach-integrator/built-in.o: In function `ap_map_io': integrator_cp.c:(.init.text+0x570): undefined reference to `pci_v3_early_init' make[1]: *** [vmlinux] Error 1 make: *** [sub-make] Error 2 Signed-off-by: Joerg Roedel --- arch/arm/mach-integrator/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index abeff25..be16569 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig @@ -9,6 +9,7 @@ config ARCH_INTEGRATOR_AP select SERIAL_AMBA_PL010 select SERIAL_AMBA_PL010_CONSOLE select SOC_BUS + depends on PCI help Include support for the ARM(R) Integrator/AP and Integrator/PP2 platforms.