[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>
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/include/asm
parent: a1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff)
18 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index 9f2c5305c260..75154b193117 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -6,7 +6,7 @@ typedef unsigned int dmach_t;
 #include <linux/spinlock.h>
 #include <asm/system.h>
 #include <asm/scatterlist.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 /*
 * This is the maximum virtual address which can be DMA'd from.
diff --git a/arch/arm/include/asm/floppy.h b/arch/arm/include/asm/floppy.h
index dce20c25ab10..c9f03eccc9d8 100644
--- a/arch/arm/include/asm/floppy.h
+++ b/arch/arm/include/asm/floppy.h
@@ -12,7 +12,7 @@
 #ifndef __ASM_ARM_FLOPPY_H
 #define __ASM_ARM_FLOPPY_H
 #if 0
-#include <asm/arch/floppy.h>
+#include <mach/floppy.h>
 #endif
 #define fd_outb(val,port)                       \
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index fff4f800ee42..166a7a3e2840 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -2,6 +2,6 @@
 #define _ARCH_ARM_GPIO_H
 /* not all ARM platforms necessarily support this API ... */
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #endif /* _ARCH_ARM_GPIO_H */
diff --git a/arch/arm/include/asm/hardware/dec21285.h b/arch/arm/include/asm/hardware/dec21285.h
index cf2578ffd54d..0d7552751aaf 100644
--- a/arch/arm/include/asm/hardware/dec21285.h
+++ b/arch/arm/include/asm/hardware/dec21285.h
@@ -19,7 +19,7 @@
 #define DC21285_PCI_MEM                 0x80000000
 #ifndef __ASSEMBLY__
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #define DC21285_IO(x)           ((volatile unsigned long *)(ARMCSR_BASE+(x)))
 #else
 #define DC21285_IO(x)           (x)
diff --git a/arch/arm/include/asm/hardware/iop3xx-adma.h b/arch/arm/include/asm/hardware/iop3xx-adma.h
index df31b15cf6e0..87bff09633aa 100644
--- a/arch/arm/include/asm/hardware/iop3xx-adma.h
+++ b/arch/arm/include/asm/hardware/iop3xx-adma.h
@@ -19,7 +19,7 @@
 #define _ADMA_H
 #include <linux/types.h>
 #include <linux/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/iop_adma.h>
 /* Memory copy units */
diff --git a/arch/arm/include/asm/hardware/iop3xx-gpio.h b/arch/arm/include/asm/hardware/iop3xx-gpio.h
index 0ebc91cb42f9..b69d972b1f7d 100644
--- a/arch/arm/include/asm/hardware/iop3xx-gpio.h
+++ b/arch/arm/include/asm/hardware/iop3xx-gpio.h
@@ -25,7 +25,7 @@
 #ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
 #define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm-generic/gpio.h>
 #define IOP3XX_N_GPIOS  8
diff --git a/arch/arm/include/asm/hardware/sa1111.h b/arch/arm/include/asm/hardware/sa1111.h
index 6cf98d4f7dc3..5da2595759e5 100644
--- a/arch/arm/include/asm/hardware/sa1111.h
+++ b/arch/arm/include/asm/hardware/sa1111.h
@@ -12,7 +12,7 @@
 #ifndef _ASM_ARCH_SA1111
 #define _ASM_ARCH_SA1111
-#include <asm/arch/bitfield.h>
+#include <mach/bitfield.h>
 /*
 * The SA1111 is always located at virtual 0xf4000000, and is always
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index ffe07c0f46d8..94a95d7fafd6 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -82,7 +82,7 @@ extern void __readwrite_bug(const char *fn);
 /*
 * Now, pick up the machine-defined IO definitions
 */
-#include <asm/arch/io.h>
+#include <mach/io.h>
 /*
 *  IO port access primitives
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
index 9cb01907e43b..d6786090d02c 100644
--- a/arch/arm/include/asm/irq.h
+++ b/arch/arm/include/asm/irq.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_ARM_IRQ_H
 #define __ASM_ARM_IRQ_H
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 #ifndef irq_canonicalize
 #define irq_canonicalize(i)     (i)
diff --git a/arch/arm/include/asm/mc146818rtc.h b/arch/arm/include/asm/mc146818rtc.h
index 7b81e0c42543..e1ca48a9e973 100644
--- a/arch/arm/include/asm/mc146818rtc.h
+++ b/arch/arm/include/asm/mc146818rtc.h
@@ -4,7 +4,7 @@
 #ifndef _ASM_MC146818RTC_H
 #define _ASM_MC146818RTC_H
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 #include <asm/io.h>
 #ifndef RTC_PORT
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 92069221dca9..1e070a2b561a 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -24,7 +24,7 @@
 #endif
 #include <linux/compiler.h>
-#include <asm/arch/memory.h>
+#include <mach/memory.h>
 #include <asm/sizes.h>
 #ifdef CONFIG_MMU
diff --git a/arch/arm/include/asm/mmzone.h b/arch/arm/include/asm/mmzone.h
index f2fbb5084901..ae63a4fd28c8 100644
--- a/arch/arm/include/asm/mmzone.h
+++ b/arch/arm/include/asm/mmzone.h
@@ -25,6 +25,6 @@ extern pg_data_t discontig_node_data[];
 */
 #define NODE_MEM_MAP(nid)       (NODE_DATA(nid)->node_mem_map)
-#include <asm/arch/memory.h>
+#include <mach/memory.h>
 #endif
diff --git a/arch/arm/include/asm/mtd-xip.h b/arch/arm/include/asm/mtd-xip.h
index 4bc50f9abe38..4225372a26f3 100644
--- a/arch/arm/include/asm/mtd-xip.h
+++ b/arch/arm/include/asm/mtd-xip.h
@@ -17,8 +17,8 @@
 #ifndef __ARM_MTD_XIP_H__
 #define __ARM_MTD_XIP_H__
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
-#include <asm/arch/mtd-xip.h>
+#include <mach/mtd-xip.h>
 /* fill instruction prefetch */
 #define xip_iprefetch()         do { asm volatile (".rep 8; nop; .endr"); } while (0)
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
index 968b833f3bb7..721c03d53f4b 100644
--- a/arch/arm/include/asm/pci.h
+++ b/arch/arm/include/asm/pci.h
@@ -4,7 +4,7 @@
 #ifdef __KERNEL__
 #include <asm-generic/pci-dma-compat.h>
-#include <asm/arch/hardware.h> /* for PCIBIOS_MIN_* */
+#include <mach/hardware.h> /* for PCIBIOS_MIN_* */
 #define pcibios_scan_all_fns(a, b)      0
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 8ab060a53ab0..8e21ef15bd74 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -20,7 +20,7 @@
 #else
 #include <asm/memory.h>
-#include <asm/arch/vmalloc.h>
+#include <mach/vmalloc.h>
 #include <asm/pgtable-hwdef.h>
 /*
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
index cc12a525a06a..727b5c042e52 100644
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
@@ -14,7 +14,7 @@
 #include <linux/cpumask.h>
 #include <linux/thread_info.h>
-#include <asm/arch/smp.h>
+#include <mach/smp.h>
 #ifndef CONFIG_SMP
 # error "<asm/smp.h> included in non-SMP build"
diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h
index e50e2926cd6e..3be8de3adaba 100644
--- a/arch/arm/include/asm/timex.h
+++ b/arch/arm/include/asm/timex.h
@@ -12,7 +12,7 @@
 #ifndef _ASMARM_TIMEX_H
 #define _ASMARM_TIMEX_H
-#include <asm/arch/timex.h>
+#include <mach/timex.h>
 typedef unsigned long cycles_t;
diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h
index 4f767ad3a0bb..6a3cd2a2f670 100644
--- a/arch/arm/include/asm/vga.h
+++ b/arch/arm/include/asm/vga.h
@@ -1,7 +1,7 @@
 #ifndef ASMARM_VGA_H
 #define ASMARM_VGA_H
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #define VGA_MAP_MEM(x,s)        (PCIMEM_BASE + (x))
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/include/asm
parent	a1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff)

diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index 9f2c5305c260..75154b193117 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h
@@ -6,7 +6,7 @@ typedef unsigned int dmach_t;
6	#include <linux/spinlock.h>	6	#include <linux/spinlock.h>
7	#include <asm/system.h>	7	#include <asm/system.h>
8	#include <asm/scatterlist.h>	8	#include <asm/scatterlist.h>
9	#include <asm/arch/dma.h>	9	#include <mach/dma.h>
10		10
11	/*	11	/*
12	* This is the maximum virtual address which can be DMA'd from.	12	* This is the maximum virtual address which can be DMA'd from.


diff --git a/arch/arm/include/asm/floppy.h b/arch/arm/include/asm/floppy.h index dce20c25ab10..c9f03eccc9d8 100644 --- a/arch/arm/include/asm/floppy.h +++ b/arch/arm/include/asm/floppy.h
@@ -12,7 +12,7 @@
12	#ifndef __ASM_ARM_FLOPPY_H	12	#ifndef __ASM_ARM_FLOPPY_H
13	#define __ASM_ARM_FLOPPY_H	13	#define __ASM_ARM_FLOPPY_H
14	#if 0	14	#if 0
15	#include <asm/arch/floppy.h>	15	#include <mach/floppy.h>
16	#endif	16	#endif
17		17
18	#define fd_outb(val,port) \	18	#define fd_outb(val,port) \


diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index fff4f800ee42..166a7a3e2840 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h
@@ -2,6 +2,6 @@
2	#define _ARCH_ARM_GPIO_H	2	#define _ARCH_ARM_GPIO_H
3		3
4	/* not all ARM platforms necessarily support this API ... */	4	/* not all ARM platforms necessarily support this API ... */
5	#include <asm/arch/gpio.h>	5	#include <mach/gpio.h>
6		6
7	#endif /* _ARCH_ARM_GPIO_H */	7	#endif /* _ARCH_ARM_GPIO_H */


diff --git a/arch/arm/include/asm/hardware/dec21285.h b/arch/arm/include/asm/hardware/dec21285.h index cf2578ffd54d..0d7552751aaf 100644 --- a/arch/arm/include/asm/hardware/dec21285.h +++ b/arch/arm/include/asm/hardware/dec21285.h
@@ -19,7 +19,7 @@
19	#define DC21285_PCI_MEM 0x80000000	19	#define DC21285_PCI_MEM 0x80000000
20		20
21	#ifndef __ASSEMBLY__	21	#ifndef __ASSEMBLY__
22	#include <asm/arch/hardware.h>	22	#include <mach/hardware.h>
23	#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x)))	23	#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x)))
24	#else	24	#else
25	#define DC21285_IO(x) (x)	25	#define DC21285_IO(x) (x)


diff --git a/arch/arm/include/asm/hardware/iop3xx-adma.h b/arch/arm/include/asm/hardware/iop3xx-adma.h index df31b15cf6e0..87bff09633aa 100644 --- a/arch/arm/include/asm/hardware/iop3xx-adma.h +++ b/arch/arm/include/asm/hardware/iop3xx-adma.h
@@ -19,7 +19,7 @@
19	#define _ADMA_H	19	#define _ADMA_H
20	#include <linux/types.h>	20	#include <linux/types.h>
21	#include <linux/io.h>	21	#include <linux/io.h>
22	#include <asm/arch/hardware.h>	22	#include <mach/hardware.h>
23	#include <asm/hardware/iop_adma.h>	23	#include <asm/hardware/iop_adma.h>
24		24
25	/* Memory copy units */	25	/* Memory copy units */


diff --git a/arch/arm/include/asm/hardware/iop3xx-gpio.h b/arch/arm/include/asm/hardware/iop3xx-gpio.h index 0ebc91cb42f9..b69d972b1f7d 100644 --- a/arch/arm/include/asm/hardware/iop3xx-gpio.h +++ b/arch/arm/include/asm/hardware/iop3xx-gpio.h
@@ -25,7 +25,7 @@
25	#ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H	25	#ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
26	#define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H	26	#define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
27		27
28	#include <asm/arch/hardware.h>	28	#include <mach/hardware.h>
29	#include <asm-generic/gpio.h>	29	#include <asm-generic/gpio.h>
30		30
31	#define IOP3XX_N_GPIOS 8	31	#define IOP3XX_N_GPIOS 8


diff --git a/arch/arm/include/asm/hardware/sa1111.h b/arch/arm/include/asm/hardware/sa1111.h index 6cf98d4f7dc3..5da2595759e5 100644 --- a/arch/arm/include/asm/hardware/sa1111.h +++ b/arch/arm/include/asm/hardware/sa1111.h
@@ -12,7 +12,7 @@
12	#ifndef _ASM_ARCH_SA1111	12	#ifndef _ASM_ARCH_SA1111
13	#define _ASM_ARCH_SA1111	13	#define _ASM_ARCH_SA1111
14		14
15	#include <asm/arch/bitfield.h>	15	#include <mach/bitfield.h>
16		16
17	/*	17	/*
18	* The SA1111 is always located at virtual 0xf4000000, and is always	18	* The SA1111 is always located at virtual 0xf4000000, and is always


diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index ffe07c0f46d8..94a95d7fafd6 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h
@@ -82,7 +82,7 @@ extern void __readwrite_bug(const char *fn);
82	/*	82	/*
83	* Now, pick up the machine-defined IO definitions	83	* Now, pick up the machine-defined IO definitions
84	*/	84	*/
85	#include <asm/arch/io.h>	85	#include <mach/io.h>
86		86
87	/*	87	/*
88	* IO port access primitives	88	* IO port access primitives


diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 9cb01907e43b..d6786090d02c 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h
@@ -1,7 +1,7 @@
1	#ifndef __ASM_ARM_IRQ_H	1	#ifndef __ASM_ARM_IRQ_H
2	#define __ASM_ARM_IRQ_H	2	#define __ASM_ARM_IRQ_H
3		3
4	#include <asm/arch/irqs.h>	4	#include <mach/irqs.h>
5		5
6	#ifndef irq_canonicalize	6	#ifndef irq_canonicalize
7	#define irq_canonicalize(i) (i)	7	#define irq_canonicalize(i) (i)


diff --git a/arch/arm/include/asm/mc146818rtc.h b/arch/arm/include/asm/mc146818rtc.h index 7b81e0c42543..e1ca48a9e973 100644 --- a/arch/arm/include/asm/mc146818rtc.h +++ b/arch/arm/include/asm/mc146818rtc.h
@@ -4,7 +4,7 @@
4	#ifndef _ASM_MC146818RTC_H	4	#ifndef _ASM_MC146818RTC_H
5	#define _ASM_MC146818RTC_H	5	#define _ASM_MC146818RTC_H
6		6
7	#include <asm/arch/irqs.h>	7	#include <mach/irqs.h>
8	#include <asm/io.h>	8	#include <asm/io.h>
9		9
10	#ifndef RTC_PORT	10	#ifndef RTC_PORT


diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 92069221dca9..1e070a2b561a 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h
@@ -24,7 +24,7 @@
24	#endif	24	#endif
25		25
26	#include <linux/compiler.h>	26	#include <linux/compiler.h>
27	#include <asm/arch/memory.h>	27	#include <mach/memory.h>
28	#include <asm/sizes.h>	28	#include <asm/sizes.h>
29		29
30	#ifdef CONFIG_MMU	30	#ifdef CONFIG_MMU


diff --git a/arch/arm/include/asm/mmzone.h b/arch/arm/include/asm/mmzone.h index f2fbb5084901..ae63a4fd28c8 100644 --- a/arch/arm/include/asm/mmzone.h +++ b/arch/arm/include/asm/mmzone.h
@@ -25,6 +25,6 @@ extern pg_data_t discontig_node_data[];
25	*/	25	*/
26	#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map)	26	#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map)
27		27
28	#include <asm/arch/memory.h>	28	#include <mach/memory.h>
29		29
30	#endif	30	#endif


diff --git a/arch/arm/include/asm/mtd-xip.h b/arch/arm/include/asm/mtd-xip.h index 4bc50f9abe38..4225372a26f3 100644 --- a/arch/arm/include/asm/mtd-xip.h +++ b/arch/arm/include/asm/mtd-xip.h
@@ -17,8 +17,8 @@
17	#ifndef __ARM_MTD_XIP_H__	17	#ifndef __ARM_MTD_XIP_H__
18	#define __ARM_MTD_XIP_H__	18	#define __ARM_MTD_XIP_H__
19		19
20	#include <asm/arch/hardware.h>	20	#include <mach/hardware.h>
21	#include <asm/arch/mtd-xip.h>	21	#include <mach/mtd-xip.h>
22		22
23	/* fill instruction prefetch */	23	/* fill instruction prefetch */
24	#define xip_iprefetch() do { asm volatile (".rep 8; nop; .endr"); } while (0)	24	#define xip_iprefetch() do { asm volatile (".rep 8; nop; .endr"); } while (0)


diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index 968b833f3bb7..721c03d53f4b 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h
@@ -4,7 +4,7 @@
4	#ifdef __KERNEL__	4	#ifdef __KERNEL__
5	#include <asm-generic/pci-dma-compat.h>	5	#include <asm-generic/pci-dma-compat.h>
6		6
7	#include <asm/arch/hardware.h> /* for PCIBIOS_MIN_* */	7	#include <mach/hardware.h> /* for PCIBIOS_MIN_* */
8		8
9	#define pcibios_scan_all_fns(a, b) 0	9	#define pcibios_scan_all_fns(a, b) 0
10		10


diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 8ab060a53ab0..8e21ef15bd74 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h
@@ -20,7 +20,7 @@
20	#else	20	#else
21		21
22	#include <asm/memory.h>	22	#include <asm/memory.h>
23	#include <asm/arch/vmalloc.h>	23	#include <mach/vmalloc.h>
24	#include <asm/pgtable-hwdef.h>	24	#include <asm/pgtable-hwdef.h>
25		25
26	/*	26	/*


diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h index cc12a525a06a..727b5c042e52 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h
@@ -14,7 +14,7 @@
14	#include <linux/cpumask.h>	14	#include <linux/cpumask.h>
15	#include <linux/thread_info.h>	15	#include <linux/thread_info.h>
16		16
17	#include <asm/arch/smp.h>	17	#include <mach/smp.h>
18		18
19	#ifndef CONFIG_SMP	19	#ifndef CONFIG_SMP
20	# error "<asm/smp.h> included in non-SMP build"	20	# error "<asm/smp.h> included in non-SMP build"


diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h index e50e2926cd6e..3be8de3adaba 100644 --- a/arch/arm/include/asm/timex.h +++ b/arch/arm/include/asm/timex.h
@@ -12,7 +12,7 @@
12	#ifndef _ASMARM_TIMEX_H	12	#ifndef _ASMARM_TIMEX_H
13	#define _ASMARM_TIMEX_H	13	#define _ASMARM_TIMEX_H
14		14
15	#include <asm/arch/timex.h>	15	#include <mach/timex.h>
16		16
17	typedef unsigned long cycles_t;	17	typedef unsigned long cycles_t;
18		18


diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h index 4f767ad3a0bb..6a3cd2a2f670 100644 --- a/arch/arm/include/asm/vga.h +++ b/arch/arm/include/asm/vga.h
@@ -1,7 +1,7 @@
1	#ifndef ASMARM_VGA_H	1	#ifndef ASMARM_VGA_H
2	#define ASMARM_VGA_H	2	#define ASMARM_VGA_H
3		3
4	#include <asm/arch/hardware.h>	4	#include <mach/hardware.h>
5	#include <asm/io.h>	5	#include <asm/io.h>
6		6
7	#define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x))	7	#define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x))