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/mach-sa1100/collie.c | |
| 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/mach-sa1100/collie.c')
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 40893638be70..fe289997cfaf 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
| @@ -26,11 +26,11 @@ | |||
| 26 | #include <linux/mtd/partitions.h> | 26 | #include <linux/mtd/partitions.h> |
| 27 | #include <linux/timer.h> | 27 | #include <linux/timer.h> |
| 28 | 28 | ||
| 29 | #include <asm/arch/hardware.h> | 29 | #include <mach/hardware.h> |
| 30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
| 31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
| 32 | #include <asm/setup.h> | 32 | #include <asm/setup.h> |
| 33 | #include <asm/arch/collie.h> | 33 | #include <mach/collie.h> |
| 34 | 34 | ||
| 35 | #include <asm/mach/arch.h> | 35 | #include <asm/mach/arch.h> |
| 36 | #include <asm/mach/flash.h> | 36 | #include <asm/mach/flash.h> |
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <asm/hardware/scoop.h> | 40 | #include <asm/hardware/scoop.h> |
| 41 | #include <asm/mach/sharpsl_param.h> | 41 | #include <asm/mach/sharpsl_param.h> |
| 42 | #include <asm/hardware/locomo.h> | 42 | #include <asm/hardware/locomo.h> |
| 43 | #include <asm/arch/mcp.h> | 43 | #include <mach/mcp.h> |
| 44 | 44 | ||
| 45 | #include "generic.h" | 45 | #include "generic.h" |
| 46 | 46 | ||