From patchwork Fri Jan 25 23:35:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2048571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 87140DF23E for ; Fri, 25 Jan 2013 23:42:49 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tyssn-00010K-Ev; Fri, 25 Jan 2013 23:40:29 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tyson-00071b-Vu for linux-arm-kernel@lists.infradead.org; Fri, 25 Jan 2013 23:36:40 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0MS2e2-1UR2Zk3geg-00TGla; Sat, 26 Jan 2013 00:36:19 +0100 From: Arnd Bergmann To: Viresh Kumar Subject: [PATCH 10/13] ARM: spear: rename duplicate pl080_plat_data Date: Fri, 25 Jan 2013 23:35:53 +0000 Message-Id: <1359156956-32404-11-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1359156956-32404-1-git-send-email-arnd@arndb.de> References: <1359156956-32404-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:HImNYSLuP2tGYQzotbYvYa90C5lmgOkEyq2LTHlnLEr lv27zUZuz26ZtkAHUYISHl24I04NfUOm4MkCa9xafFI12rjxbI NaOow+MLetgzk839HO4UGITMEM1HKEnC/SXWec9SyhRxpvHULR JrZgnxAXSXviRR9/SKOvYPPHDrtlbFlNh8q7yFbd74B143lwB8 Uh7IjQJZN+T0lnp4V3Tc4DoW6pl8SpHghzdgYNf5qWhQFwU5/D heRpmchz8KwtKE/0fFGTD1IZh0Eb/l5btH4RgfqOq8aBSeeN2s kZKN0BPWRQvOLJ9KFkh0oQ4pWYvtIRx3/DjWEy8DChBhbEg/3w 1nRl/CjDqXifib9FKi534I9YZvQiiSpuvNurlAV+0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130125_183622_456135_4252C427 X-CRM114-Status: GOOD ( 11.27 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: spear-devel@list.st.com, Arnd Bergmann , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Both spear3xx and spear6xx have a global symbol named pl080_plat_data. Eventually, both should be removed, but for now, we can rename one to pl080_plat_data and declare it static, since that one does not actually need to be visible outside of spear6xx.c. Signed-off-by: Arnd Bergmann --- arch/arm/mach-spear/spear6xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index 79cbda0..f6d4473 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c @@ -323,7 +323,7 @@ static struct pl08x_channel_data spear600_dma_info[] = { }, }; -struct pl08x_platform_data pl080_plat_data = { +static struct pl08x_platform_data spear6xx_pl080_plat_data = { .memcpy_channel = { .bus_id = "memcpy", .cctl_memcpy = @@ -411,7 +411,7 @@ struct sys_timer spear6xx_timer = { /* Add auxdata to pass platform data */ struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("arm,pl080", SPEAR_ICM3_DMA_BASE, NULL, - &pl080_plat_data), + &spear6xx_pl080_plat_data), {} };