From patchwork Wed Mar 19 19:29:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3861131 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 35508BF540 for ; Wed, 19 Mar 2014 20:47:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 465A120218 for ; Wed, 19 Mar 2014 20:47:49 +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 2344120203 for ; Wed, 19 Mar 2014 20:47:48 +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 1WQMLS-0004cp-Ne; Wed, 19 Mar 2014 19:40:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMKR-0006Fn-6l; Wed, 19 Mar 2014 19:39:07 +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 1WQMCs-0005Xd-6v for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:31:19 +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 0LfSUj-1WsV8y1rWj-00p7Et; Wed, 19 Mar 2014 20:30:41 +0100 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH 38/62] ARM: footbridge: don't build floppy code for addin mode Date: Wed, 19 Mar 2014 20:29:35 +0100 Message-Id: <1395257399-359545-39-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:aaPWQgPwv1o0kbnzHunHXGO6rayMWFEK7qJFXiHQhAq s8OQftivclKiXx3xx2abe0ju+y2Uu427tZQf/D10Tv/7U91uD9 rPqd+JxrCg0YkPR/euHNl2+rAedDU9hIjQGFGPlGpllxbIbCcn EX7AJnCMhDxW/O/nQO4kmG6BbuCzmmrds2mxdwbbK4GcEdnCFr VJnbpY4R1M9aTRB8E28NeGehoJQ+ju87Tgd8kb3Hzo0PxDnPgk 2Q+1G/kCMaiRhtT9WXzk+jlPtSeGjrYPaDiaOZFJxdZAMF2R2g x0tFRq6L9ZCkW4iAozaKKdZyd+n7B05QLXu89kTwZwt0D2L4VR eHa8fO6qudyXhup/ug9O7BzGzgtU482RQ4idsWcI2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_153118_551919_0893D6BB X-CRM114-Status: GOOD ( 11.26 ) X-Spam-Score: -1.9 (-) 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 ARCH_EBSA285_ADDIN platform does not provide the ISA_DMA API, which is required by the floppy driver. Let's ensure that the floppy code can only be built when ISA_DMA is also enabled, by moving the select statement into ARCH_EBSA285_HOST. Signed-off-by: Arnd Bergmann Cc: Russell King --- arch/arm/mach-footbridge/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index fba55fb..07152d0 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig @@ -52,6 +52,7 @@ config ARCH_EBSA285_HOST select FOOTBRIDGE_HOST select ISA select ISA_DMA + select ARCH_MAY_HAVE_PC_FDC select PCI help Say Y here if you intend to run this kernel on the EBSA285 card @@ -94,6 +95,5 @@ config FOOTBRIDGE_ADDIN # EBSA285 board in either host or addin mode config ARCH_EBSA285 bool - select ARCH_MAY_HAVE_PC_FDC endif