diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-05 11:14:15 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:48 -0400 |
| commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
| tree | 69689f467179891b498bd7423fcf61925173db31 /arch/arm/boot | |
| parent | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff) | |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/misc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index de41daeab5e9..d42f89b7760b 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | #else | 38 | #else |
| 39 | 39 | ||
| 40 | #include <asm/arch/debug-macro.S> | 40 | #include <mach/debug-macro.S> |
| 41 | 41 | ||
| 42 | .macro writeb, ch, rb | 42 | .macro writeb, ch, rb |
| 43 | senduart \ch, \rb | 43 | senduart \ch, \rb |
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 7145cc7c04f0..65ce8fff29db 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c | |||
| @@ -27,7 +27,7 @@ unsigned int __machine_arch_type; | |||
| 27 | static void putstr(const char *ptr); | 27 | static void putstr(const char *ptr); |
| 28 | 28 | ||
| 29 | #include <linux/compiler.h> | 29 | #include <linux/compiler.h> |
| 30 | #include <asm/arch/uncompress.h> | 30 | #include <mach/uncompress.h> |
| 31 | 31 | ||
| 32 | #ifdef CONFIG_DEBUG_ICEDCC | 32 | #ifdef CONFIG_DEBUG_ICEDCC |
| 33 | 33 | ||