summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-05-02 17:12:33 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-06-17 13:54:33 +0200
commitb0bdd8bca9a8f4ae1c3f6a256e83b73edad06050 (patch)
tree1a371a73e71f769e6b86d7a277454513a7621bc0 /arch
parent69fc4ca30cbd08927df060eb1e2308c3b240a57f (diff)
downloadop-kernel-dev-b0bdd8bca9a8f4ae1c3f6a256e83b73edad06050.zip
op-kernel-dev-b0bdd8bca9a8f4ae1c3f6a256e83b73edad06050.tar.gz
ARM: u300: localize <mach/u300-regs.h>
This register base file is now only used in the machine itself so move it down into mach-u300. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-u300/core.c2
-rw-r--r--arch/arm/mach-u300/regulator.c2
-rw-r--r--arch/arm/mach-u300/u300-regs.h (renamed from arch/arm/mach-u300/include/mach/u300-regs.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 254fe92..1fdaf81 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -21,7 +21,7 @@
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
-#include <mach/u300-regs.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..1cbe88c74 100644
--- a/arch/arm/mach-u300/regulator.c
+++ b/arch/arm/mach-u300/regulator.c
@@ -17,7 +17,7 @@
#include <linux/regulator/consumer.h>
/* Those are just for writing in syscon */
#include <linux/io.h>
-#include <mach/u300-regs.h>
+#include "u300-regs.h"
/* Power Management Control 16bit (R/W) */
#define U300_SYSCON_PMCR (0x50)
diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/u300-regs.h
index 0320495..0320495 100644
--- a/arch/arm/mach-u300/include/mach/u300-regs.h
+++ b/arch/arm/mach-u300/u300-regs.h
OpenPOWER on IntegriCloud