summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/include/mach
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-15 23:50:46 +0400
committerTony Lindgren <tony@atomide.com>2012-10-25 00:34:31 +0400
commit3d82cbbb3aadb4f8a30e3f614e51be96574a0855 (patch)
tree6f510bda0fb3c08d959100928ca2fb783c61739a /arch/arm/mach-omap2/include/mach
parentede8df1eaa19f96ee8520077885856eb63acb44b (diff)
downloadlinux-3d82cbbb3aadb4f8a30e3f614e51be96574a0855.tar.xz
ARM: OMAP: Split plat/serial.h for omap1 and omap2+
For omap1, we'll keep mach/serial.h around for 8250.c hardware workarounds. For omap2+, we no longer need mach/serial.h and can make it local to mach-omap2. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/include/mach')
-rw-r--r--arch/arm/mach-omap2/include/mach/debug-macro.S2
-rw-r--r--arch/arm/mach-omap2/include/mach/uncompress.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S
index 93d10de7129f..4b5cbdfac028 100644
--- a/arch/arm/mach-omap2/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
@@ -13,7 +13,7 @@
#include <linux/serial_reg.h>
-#include <plat/serial.h>
+#include <../mach-omap2/serial.h>
#define UART_OFFSET(addr) ((addr) & 0x00ffffff)
diff --git a/arch/arm/mach-omap2/include/mach/uncompress.h b/arch/arm/mach-omap2/include/mach/uncompress.h
index 226c7571583b..28d1ec0e869a 100644
--- a/arch/arm/mach-omap2/include/mach/uncompress.h
+++ b/arch/arm/mach-omap2/include/mach/uncompress.h
@@ -23,7 +23,7 @@
#include <asm/memory.h>
#include <asm/mach-types.h>
-#include <plat/serial.h>
+#include <../mach-omap2/serial.h>
#define MDR1_MODE_MASK 0x07