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/lib | |
| 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/lib')
| -rw-r--r-- | arch/arm/lib/ecard.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/io-readsw-armv3.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/io-writesw-armv3.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S index 79cf247ad525..8678eb2b7a60 100644 --- a/arch/arm/lib/ecard.S +++ b/arch/arm/lib/ecard.S | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
| 15 | #include <asm/arch/hardware.h> | 15 | #include <mach/hardware.h> |
| 16 | 16 | ||
| 17 | #define CPSR2SPSR(rt) \ | 17 | #define CPSR2SPSR(rt) \ |
| 18 | mrs rt, cpsr; \ | 18 | mrs rt, cpsr; \ |
diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S index 4cc4411595f5..9aaf7c72065d 100644 --- a/arch/arm/lib/io-readsw-armv3.S +++ b/arch/arm/lib/io-readsw-armv3.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
| 12 | #include <asm/arch/hardware.h> | 12 | #include <mach/hardware.h> |
| 13 | 13 | ||
| 14 | .Linsw_bad_alignment: | 14 | .Linsw_bad_alignment: |
| 15 | adr r0, .Linsw_bad_align_msg | 15 | adr r0, .Linsw_bad_align_msg |
diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S index 0a34752bc448..cd34503e424d 100644 --- a/arch/arm/lib/io-writesw-armv3.S +++ b/arch/arm/lib/io-writesw-armv3.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |
| 12 | #include <asm/arch/hardware.h> | 12 | #include <mach/hardware.h> |
| 13 | 13 | ||
| 14 | .Loutsw_bad_alignment: | 14 | .Loutsw_bad_alignment: |
| 15 | adr r0, .Loutsw_bad_align_msg | 15 | adr r0, .Loutsw_bad_align_msg |
