From patchwork Wed Mar 19 19:29:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3861211 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1C308BF549 for ; Wed, 19 Mar 2014 20:58:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 59185201F4 for ; Wed, 19 Mar 2014 20:58:01 +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 59332201FB for ; Wed, 19 Mar 2014 20:58:00 +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 1WQMKW-00048C-OG; Wed, 19 Mar 2014 19:39: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 1WQMJn-0006D9-Sr; Wed, 19 Mar 2014 19:38:27 +0000 Received: from bombadil.infradead.org ([2001:1868:205::9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMCq-0005cI-28 for linux-arm-kernel@merlin.infradead.org; Wed, 19 Mar 2014 19:31:16 +0000 Received: from moutng.kundenserver.de ([212.227.17.24]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMCn-0004fQ-LH for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:31:14 +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 0MEnBC-1WKGaZ2ddy-00G3jg; Wed, 19 Mar 2014 20:30:41 +0100 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH 39/62] ARM: footbridge: fix build with PCI disabled Date: Wed, 19 Mar 2014 20:29:36 +0100 Message-Id: <1395257399-359545-40-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:yr8noRAEJtmRZx0FL8D7tOLdXyBaiZRY0OtQBlRon33 Sx76KI+cReyBTilf9xR3fAWrnUM0XRNcAAJye/dEUFE1lB4AK8 OKuplGvv0KHbLQC7oRs5Db3vrj1v2sCNt1qEOP91eTf74FGpUt iDnuLIHH1MHb/WDm53Jgqlj9JM4JrcLrmUpOFl1txDOAUMma2I t4Zk9aT2TsnMR9jpzPHHMVqvNOC9qsW6AqNYGwxMk0MJCLU4ed cdYNWT9rpAtKL0KB8+cVpW+d5lpp00pW/8zdCEAvQBhy6FU1U8 3Emhdad7zmiikAo6V9DbSHZq83IrRyr8UVoujNFbOcwOsk20AR SoGgtVLoBIKAASkgJTbI3UCWS9hFsCR+R3bxXHdCm X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_123114_066467_4571F138 X-CRM114-Status: UNSURE ( 9.99 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Russell King , Arnd Bergmann , 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 dc21285.c source file cannot be built when CONFIG_PCI is disabled, because it calls a number of PCI core interfaces. This changes the Makefile so we don't include this file in the build if CONFIG_PCI is disabled. No other code references anything defined inside of this file in this case. Signed-off-by: Arnd Bergmann Cc: Russell King --- arch/arm/mach-footbridge/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile index 0b64dd4..c3faa3b 100644 --- a/arch/arm/mach-footbridge/Makefile +++ b/arch/arm/mach-footbridge/Makefile @@ -4,11 +4,12 @@ # Object file lists. -obj-y := common.o dc21285.o dma.o isa-irq.o +obj-y := common.o dma.o isa-irq.o obj-m := obj-n := obj- := +pci-y += dc21285.o pci-$(CONFIG_ARCH_CATS) += cats-pci.o pci-$(CONFIG_ARCH_EBSA285_HOST) += ebsa285-pci.o pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o