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 /drivers/video/acornfb.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 'drivers/video/acornfb.c')
| -rw-r--r-- | drivers/video/acornfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index bad26c65d9bf..61c3d3f40fd1 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
| 30 | #include <linux/dma-mapping.h> | 30 | #include <linux/dma-mapping.h> |
| 31 | 31 | ||
| 32 | #include <asm/arch/hardware.h> | 32 | #include <mach/hardware.h> |
| 33 | #include <asm/io.h> | 33 | #include <asm/io.h> |
| 34 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
| 35 | #include <asm/mach-types.h> | 35 | #include <asm/mach-types.h> |
| @@ -339,7 +339,7 @@ acornfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, | |||
| 339 | #endif | 339 | #endif |
| 340 | 340 | ||
| 341 | #ifdef HAS_VIDC20 | 341 | #ifdef HAS_VIDC20 |
| 342 | #include <asm/arch/acornfb.h> | 342 | #include <mach/acornfb.h> |
| 343 | 343 | ||
| 344 | #define MAX_SIZE 2*1024*1024 | 344 | #define MAX_SIZE 2*1024*1024 |
| 345 | 345 | ||