From patchwork Thu Jun 20 00:27:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2752511 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 B2409C0AB1 for ; Thu, 20 Jun 2013 00:28:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B85552015C for ; Thu, 20 Jun 2013 00:28:46 +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 7254F2014C for ; Thu, 20 Jun 2013 00:28:45 +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 1UpSju-0004aV-8g; Thu, 20 Jun 2013 00:28:38 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpSjr-0000QG-Q4; Thu, 20 Jun 2013 00:28:35 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpSjp-0000Py-15 for linux-arm-kernel@lists.infradead.org; Thu, 20 Jun 2013 00:28:33 +0000 Received: from klappe2.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0LhRTw-1UTeYH2cHA-00mqJY; Thu, 20 Jun 2013 02:27:33 +0200 From: Arnd Bergmann To: Linus Walleij Subject: Re: [GIT PULL] U300 multiplatform for v3.11 Date: Thu, 20 Jun 2013 02:27:31 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) References: In-Reply-To: MIME-Version: 1.0 Message-Id: <201306200227.31603.arnd@arndb.de> X-Provags-ID: V02:K0:mTnqoG97Ar8Rk2CWxcMxTetsqQsBJW65fvy5LsqoXjI zkSc+dUVUKRmPyp4OB0CyBdIi/EdUY5HBbcdZe2F0IunlXXObi Y8aaQ97H8TwAufTG0Z4lA9VMar7moZB/13akHdoWXeA/L1HTfi FYJkYmrC7WqCcVyy4jV0GrXHCV4kEfciTfyRS0rY8Zj8aFtZof iK1nccbC76Bhd0CWvSwKUzOdc0YHMauVsHivERMY+gN60j4Q5i /RHMvjtbv7r6o4zxmtJUw2jCoPfKTpsOy1wOadzaE3mYQHxWST DSfJwoIX1oPTlWz7zpVltJKppU19Csn3AuKgFJIhf8mE3Fh6vi RFhX0OMwCFiCwj1tS2cc= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130619_202833_285162_C1986FC3 X-CRM114-Status: UNSURE ( 7.84 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Alessandro Zummo , Ulf Hansson , Mike Turquette , Wolfram Sang , Vinod Koul , Wim Van Sebroeck , "arm@kernel.org" , Peter Huewe , "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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 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 I needed this patch on top. From e0a60445624107912e4684e20e5e9158b94b4c87 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 20 Jun 2013 02:26:37 +0200 Subject: [PATCH] ARM: u300: only build for ARCH_MULTI_V5 This avoids impossible platform combinations, as we cannot build a combined V5 + V6/V7 kernel. Signed-off-by: Arnd Bergmann Acked-by: Linus Walleij diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index 09f4dda..a85adcd 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig @@ -3,7 +3,7 @@ menu "ST-Ericsson AB U300/U335 Platform" comment "ST-Ericsson Mobile Platform Products" config ARCH_U300 - bool "ST-Ericsson U300 Series" + bool "ST-Ericsson U300 Series" if ARCH_MULTI_V5 depends on MMU select ARCH_REQUIRE_GPIOLIB select ARM_AMBA