From patchwork Tue Feb 11 21:21:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 3632981 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 D34029F334 for ; Tue, 11 Feb 2014 21:21:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B1022201F2 for ; Tue, 11 Feb 2014 21:21:50 +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 B1E27201FE for ; Tue, 11 Feb 2014 21:21:49 +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 1WDKm2-0000cd-1s; Tue, 11 Feb 2014 21:21:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDKlz-0005Gp-HC; Tue, 11 Feb 2014 21:21:43 +0000 Received: from cpsmtpb-ews07.kpnxchange.com ([213.75.39.10]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDKlv-0005Fn-FA for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2014 21:21:40 +0000 Received: from cpsps-ews14.kpnxchange.com ([10.94.84.181]) by cpsmtpb-ews07.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 11 Feb 2014 22:21:17 +0100 Received: from CPSMTPM-TLF103.kpnxchange.com ([195.121.3.6]) by cpsps-ews14.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 11 Feb 2014 22:21:17 +0100 Received: from [192.168.1.104] ([82.169.24.127]) by CPSMTPM-TLF103.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 11 Feb 2014 22:21:17 +0100 Message-ID: <1392153676.14317.8.camel@x220> Subject: [PATCH] ARM: spear: Remove references to PLAT_SPEAR_SINGLE From: Paul Bolle To: Viresh Kumar , Shiraz Hashim , Russell King Date: Tue, 11 Feb 2014 22:21:16 +0100 X-Mailer: Evolution 3.10.3 (3.10.3-1.fc20) Mime-Version: 1.0 X-OriginalArrivalTime: 11 Feb 2014 21:21:17.0635 (UTC) FILETIME=[3386A930:01CF276F] X-RcptDomain: lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140211_162139_676948_0ED3D4A7 X-CRM114-Status: UNSURE ( 9.37 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Richard Weinberger , Martin Walch , spear-devel@list.st.com, 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: , 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.8 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 The Kconfig symbol PLAT_SPEAR_SINGLE briefly appeared during the v3.10 development cycle. It was removed in a merge commit before v3.10. A few references to it were left in the tree, probably because they didn't generate merge conflicts. Whatever it was, they're useless now and can safely be removed. Reported-by: Martin Walch Signed-off-by: Paul Bolle --- Untested. arch/arm/mach-spear/Kconfig | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig index ac1710e6..1595776 100644 --- a/arch/arm/mach-spear/Kconfig +++ b/arch/arm/mach-spear/Kconfig @@ -4,7 +4,6 @@ menuconfig PLAT_SPEAR bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5 - default PLAT_SPEAR_SINGLE select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select CLKSRC_MMIO @@ -15,7 +14,7 @@ if PLAT_SPEAR config ARCH_SPEAR13XX bool "ST SPEAr13xx" - depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE + depends on ARCH_MULTI_V7 select ARCH_HAS_CPUFREQ select ARM_GIC select CPU_V7 @@ -47,7 +46,7 @@ endif #ARCH_SPEAR13XX config ARCH_SPEAR3XX bool "ST SPEAr3xx" - depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE + depends on ARCH_MULTI_V5 depends on !ARCH_SPEAR13XX select ARM_VIC select CPU_ARM926T @@ -80,7 +79,7 @@ endif config ARCH_SPEAR6XX bool "ST SPEAr6XX" - depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE + depends on ARCH_MULTI_V5 depends on !ARCH_SPEAR13XX select ARM_VIC select CPU_ARM926T @@ -95,7 +94,6 @@ config MACH_SPEAR600 Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig" config ARCH_SPEAR_AUTO - def_bool PLAT_SPEAR_SINGLE depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX select ARCH_SPEAR3XX