[ARM] Include asm/hardware.h not asm/arch/hardware.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2006-06-20 19:53:16 +01:00 · 2006-06-20 19:53:16 +01:00 · ea75ee9ab8
commit ea75ee9ab8
parent 3a8182bd88
18 changed files with 18 additions and 18 deletions
--- a/arch/arm/mach-at91rm9200/board-carmeva.c
+++ b/arch/arm/mach-at91rm9200/board-carmeva.c
@ -35,7 +35,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>

--- a/arch/arm/mach-at91rm9200/board-csb337.c
+++ b/arch/arm/mach-at91rm9200/board-csb337.c
@ -35,7 +35,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>

--- a/arch/arm/mach-at91rm9200/board-csb637.c
+++ b/arch/arm/mach-at91rm9200/board-csb637.c
@ -34,7 +34,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>

--- a/arch/arm/mach-at91rm9200/board-dk.c
+++ b/arch/arm/mach-at91rm9200/board-dk.c
@ -38,7 +38,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>

--- a/arch/arm/mach-at91rm9200/board-eb9200.c
+++ b/arch/arm/mach-at91rm9200/board-eb9200.c
@ -35,7 +35,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>

--- a/arch/arm/mach-at91rm9200/board-ek.c
+++ b/arch/arm/mach-at91rm9200/board-ek.c
@ -38,7 +38,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>

--- a/arch/arm/mach-at91rm9200/board-kafa.c
+++ b/arch/arm/mach-at91rm9200/board-kafa.c
@ -34,7 +34,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>

--- a/arch/arm/mach-at91rm9200/board-kb9202.c
+++ b/arch/arm/mach-at91rm9200/board-kb9202.c
@ -35,7 +35,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>

--- a/arch/arm/mach-at91rm9200/clock.c
+++ b/arch/arm/mach-at91rm9200/clock.c
@ -27,7 +27,7 @@
 #include <asm/io.h>
 #include <asm/mach-types.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>

 #include "generic.h"

--- a/arch/arm/mach-at91rm9200/common.c
+++ b/arch/arm/mach-at91rm9200/common.c
@ -16,7 +16,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include "generic.h"

 static struct map_desc at91rm9200_io_desc[] __initdata = {
--- a/arch/arm/mach-at91rm9200/devices.c
+++ b/arch/arm/mach-at91rm9200/devices.c
@ -16,7 +16,7 @@
 #include <linux/config.h>
 #include <linux/platform_device.h>

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>

--- a/arch/arm/mach-at91rm9200/gpio.c
+++ b/arch/arm/mach-at91rm9200/gpio.c
@ -16,7 +16,7 @@

 #include <asm/io.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/gpio.h>

 static const u32 pio_controller_offset[4] = {
--- a/arch/arm/mach-netx/fb.c
+++ b/arch/arm/mach-netx/fb.c
@ -24,7 +24,7 @@
 #include <linux/amba/clcd.h>

 #include <asm/arch/netx-regs.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>

 struct clk {};

--- a/arch/arm/mach-pnx4008/serial.c
+++ b/arch/arm/mach-pnx4008/serial.c
@ -16,7 +16,7 @@
 #include <asm/io.h>

 #include <asm/arch/platform.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>

 #include <linux/serial_core.h>
 #include <linux/serial_reg.h>
--- a/include/asm-arm/arch-at91rm9200/memory.h
+++ b/include/asm-arm/arch-at91rm9200/memory.h
@ -21,7 +21,7 @@
 #ifndef __ASM_ARCH_MEMORY_H
 #define __ASM_ARCH_MEMORY_H

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>

 #define PHYS_OFFSET	(AT91_SDRAM_BASE)

--- a/include/asm-arm/arch-at91rm9200/system.h
+++ b/include/asm-arm/arch-at91rm9200/system.h
@ -21,7 +21,7 @@
 #ifndef __ASM_ARCH_SYSTEM_H
 #define __ASM_ARCH_SYSTEM_H

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>

 static inline void arch_idle(void)
 {
--- a/include/asm-arm/arch-at91rm9200/timex.h
+++ b/include/asm-arm/arch-at91rm9200/timex.h
@ -21,7 +21,7 @@
 #ifndef __ASM_ARCH_TIMEX_H
 #define __ASM_ARCH_TIMEX_H

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>

 #define CLOCK_TICK_RATE		(AT91_SLOW_CLOCK)

--- a/include/asm-arm/arch-at91rm9200/uncompress.h
+++ b/include/asm-arm/arch-at91rm9200/uncompress.h
@ -21,7 +21,7 @@
 #ifndef __ASM_ARCH_UNCOMPRESS_H
 #define __ASM_ARCH_UNCOMPRESS_H

-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>

 /*
 * The following code assumes the serial port has already been