diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-15 15:50:46 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-24 16:34:31 -0400 |
commit | 3d82cbbb3aadb4f8a30e3f614e51be96574a0855 (patch) | |
tree | 6f510bda0fb3c08d959100928ca2fb783c61739a /arch/arm/mach-omap2/include | |
parent | ede8df1eaa19f96ee8520077885856eb63acb44b (diff) |
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')
-rw-r--r-- | arch/arm/mach-omap2/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/include/mach/uncompress.h | 2 |
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 @@ | |||
13 | 13 | ||
14 | #include <linux/serial_reg.h> | 14 | #include <linux/serial_reg.h> |
15 | 15 | ||
16 | #include <plat/serial.h> | 16 | #include <../mach-omap2/serial.h> |
17 | 17 | ||
18 | #define UART_OFFSET(addr) ((addr) & 0x00ffffff) | 18 | #define UART_OFFSET(addr) ((addr) & 0x00ffffff) |
19 | 19 | ||
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 @@ | |||
23 | #include <asm/memory.h> | 23 | #include <asm/memory.h> |
24 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
25 | 25 | ||
26 | #include <plat/serial.h> | 26 | #include <../mach-omap2/serial.h> |
27 | 27 | ||
28 | #define MDR1_MODE_MASK 0x07 | 28 | #define MDR1_MODE_MASK 0x07 |
29 | 29 | ||