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-pxa/magician.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-pxa/magician.c')
-rw-r--r-- | arch/arm/mach-pxa/magician.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index e919f37be72b..143f28adaf95 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
@@ -26,18 +26,18 @@ | |||
26 | #include <linux/pda_power.h> | 26 | #include <linux/pda_power.h> |
27 | #include <linux/pwm_backlight.h> | 27 | #include <linux/pwm_backlight.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/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
32 | #include <asm/arch/magician.h> | 32 | #include <mach/magician.h> |
33 | #include <asm/arch/mfp-pxa27x.h> | 33 | #include <mach/mfp-pxa27x.h> |
34 | #include <asm/arch/pxa-regs.h> | 34 | #include <mach/pxa-regs.h> |
35 | #include <asm/arch/pxa2xx-regs.h> | 35 | #include <mach/pxa2xx-regs.h> |
36 | #include <asm/arch/pxafb.h> | 36 | #include <mach/pxafb.h> |
37 | #include <asm/arch/i2c.h> | 37 | #include <mach/i2c.h> |
38 | #include <asm/arch/mmc.h> | 38 | #include <mach/mmc.h> |
39 | #include <asm/arch/irda.h> | 39 | #include <mach/irda.h> |
40 | #include <asm/arch/ohci.h> | 40 | #include <mach/ohci.h> |
41 | 41 | ||
42 | #include "devices.h" | 42 | #include "devices.h" |
43 | #include "generic.h" | 43 | #include "generic.h" |