From patchwork Thu May 2 16:16:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 2512801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 895003FD85 for ; Thu, 2 May 2013 16:22:33 +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 1UXwEE-0005j1-O1; Thu, 02 May 2013 16:19:33 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXwDG-0003z9-Jz; Thu, 02 May 2013 16:18:30 +0000 Received: from eu1sys200aog101.obsmtp.com ([207.126.144.111]) by merlin.infradead.org with smtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXwCr-0003ta-FM for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2013 16:18:06 +0000 Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob101.postini.com ([207.126.147.11]) with SMTP ID DSNKUYKRo/nIFvubIBbG4s1u3NQy2lIGFEcr@postini.com; Thu, 02 May 2013 16:18:05 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id B1A0755; Thu, 2 May 2013 16:16:28 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 58BA350; Thu, 2 May 2013 09:17:58 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 7511DA8065; Thu, 2 May 2013 18:17:17 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Thu, 2 May 2013 18:17:23 +0200 From: Linus Walleij To: Subject: [PATCH 5/7] ARM: u300: localize Date: Thu, 2 May 2013 18:16:53 +0200 Message-ID: <1367511416-4312-6-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1367511416-4312-1-git-send-email-linus.walleij@stericsson.com> References: <1367511416-4312-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_121805_765621_B009BF43 X-CRM114-Status: GOOD ( 12.20 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.126.144.111 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Linus Walleij , Arnd Bergmann 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 From: Linus Walleij This register base file is now only used in the machine itself so move it down into mach-u300. Signed-off-by: Linus Walleij --- arch/arm/mach-u300/core.c | 3 +-- arch/arm/mach-u300/regulator.c | 2 +- arch/arm/mach-u300/{include/mach => }/u300-regs.h | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/mach-u300/{include/mach => }/u300-regs.h (100%) diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/u300-regs.h similarity index 100% rename from arch/arm/mach-u300/include/mach/u300-regs.h rename to arch/arm/mach-u300/u300-regs.h diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 9a46426..87fdadb 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -25,9 +25,8 @@ #include #include -#include - #include "timer.h" +#include "u300-regs.h" /* * SYSCON addresses applicable to the core machine. diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c index ab7d7a5..1cbe88c 100644 --- a/arch/arm/mach-u300/regulator.c +++ b/arch/arm/mach-u300/regulator.c @@ -17,7 +17,7 @@ #include /* Those are just for writing in syscon */ #include -#include +#include "u300-regs.h" /* Power Management Control 16bit (R/W) */ #define U300_SYSCON_PMCR (0x50)