aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-02 17:33:18 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-02 17:35:16 -0400
commitbccf650270a94cec6e9238743e84c6e01de30c70 (patch)
tree7e58444f9a976a1d680cfe3d2d47677fabdaa048 /include/asm-arm
parent4baa9922430662431231ac637adedddbb0cfb2d7 (diff)
[ARM] Fix explicit asm(-arm)?/arch-foo references
No file should be explicitly referencing its own platform headers by specifying an absolute include path. Fix these paths to use standard <asm/arch/...> includes. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-ns9xxx/debug-macro.S2
-rw-r--r--include/asm-arm/arch-ns9xxx/entry-macro.S2
-rw-r--r--include/asm-arm/arch-ns9xxx/processor.h2
-rw-r--r--include/asm-arm/arch-ns9xxx/system.h4
-rw-r--r--include/asm-arm/arch-omap/board.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-arm/arch-ns9xxx/debug-macro.S b/include/asm-arm/arch-ns9xxx/debug-macro.S
index b21b93eb2dbc..94680950ee67 100644
--- a/include/asm-arm/arch-ns9xxx/debug-macro.S
+++ b/include/asm-arm/arch-ns9xxx/debug-macro.S
@@ -9,7 +9,7 @@
9 */ 9 */
10#include <asm/hardware.h> 10#include <asm/hardware.h>
11 11
12#include <asm/arch-ns9xxx/regs-board-a9m9750dev.h> 12#include <asm/arch/regs-board-a9m9750dev.h>
13 13
14 .macro addruart,rx 14 .macro addruart,rx
15 mrc p15, 0, \rx, c1, c0 15 mrc p15, 0, \rx, c1, c0
diff --git a/include/asm-arm/arch-ns9xxx/entry-macro.S b/include/asm-arm/arch-ns9xxx/entry-macro.S
index 89a21c530468..2f6c89ddf958 100644
--- a/include/asm-arm/arch-ns9xxx/entry-macro.S
+++ b/include/asm-arm/arch-ns9xxx/entry-macro.S
@@ -9,7 +9,7 @@
9 * the Free Software Foundation. 9 * the Free Software Foundation.
10 */ 10 */
11#include <asm/hardware.h> 11#include <asm/hardware.h>
12#include <asm/arch-ns9xxx/regs-sys-common.h> 12#include <asm/arch/regs-sys-common.h>
13 13
14 .macro get_irqnr_preamble, base, tmp 14 .macro get_irqnr_preamble, base, tmp
15 ldr \base, =SYS_ISRADDR 15 ldr \base, =SYS_ISRADDR
diff --git a/include/asm-arm/arch-ns9xxx/processor.h b/include/asm-arm/arch-ns9xxx/processor.h
index f7b53b65de81..3137e5ba01a9 100644
--- a/include/asm-arm/arch-ns9xxx/processor.h
+++ b/include/asm-arm/arch-ns9xxx/processor.h
@@ -11,7 +11,7 @@
11#ifndef __ASM_ARCH_PROCESSOR_H 11#ifndef __ASM_ARCH_PROCESSOR_H
12#define __ASM_ARCH_PROCESSOR_H 12#define __ASM_ARCH_PROCESSOR_H
13 13
14#include <asm/arch-ns9xxx/module.h> 14#include <asm/arch/module.h>
15 15
16#define processor_is_ns9210() (0 \ 16#define processor_is_ns9210() (0 \
17 || module_is_cc7ucamry() \ 17 || module_is_cc7ucamry() \
diff --git a/include/asm-arm/arch-ns9xxx/system.h b/include/asm-arm/arch-ns9xxx/system.h
index 1348073afe48..c2941684d667 100644
--- a/include/asm-arm/arch-ns9xxx/system.h
+++ b/include/asm-arm/arch-ns9xxx/system.h
@@ -12,8 +12,8 @@
12#define __ASM_ARCH_SYSTEM_H 12#define __ASM_ARCH_SYSTEM_H
13 13
14#include <asm/proc-fns.h> 14#include <asm/proc-fns.h>
15#include <asm/arch-ns9xxx/processor.h> 15#include <asm/arch/processor.h>
16#include <asm/arch-ns9xxx/processor-ns9360.h> 16#include <asm/arch/processor-ns9360.h>
17 17
18static inline void arch_idle(void) 18static inline void arch_idle(void)
19{ 19{
diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h
index db44c5d1f1a0..99564c70f128 100644
--- a/include/asm-arm/arch-omap/board.h
+++ b/include/asm-arm/arch-omap/board.h
@@ -154,7 +154,7 @@ struct omap_version_config {
154}; 154};
155 155
156 156
157#include <asm-arm/arch-omap/board-nokia.h> 157#include <asm/arch/board-nokia.h>
158 158
159struct omap_board_config_entry { 159struct omap_board_config_entry {
160 u16 tag; 160 u16 tag;