[ARM] Convert asm/io.h to linux/io.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
author: Russell King <rmk@dyn-67.arm.linux.org.uk> 2008-09-06 07:10:45 -0400
committer: Russell King <rmk+kernel@arm.linux.org.uk> 2008-09-06 07:10:45 -0400
commit: fced80c735941fa518ac67c0b61bbe153fb8c050 (patch)
tree: 16f3abeb03e8c164108873bc5aab660a506577c5 /arch/arm/mach-pnx4008
parent: 33fa9b13285e76fb95d940120964562e4c7081c2 (diff)
10 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c
index 24d036a24a72..898c0e88acbc 100644
--- a/arch/arm/mach-pnx4008/clock.c
+++ b/arch/arm/mach-pnx4008/clock.c
@@ -20,9 +20,9 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/delay.h>
+#include <linux/io.h>
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <mach/clock.h>
 #include "clock.h"
diff --git a/arch/arm/mach-pnx4008/core.c b/arch/arm/mach-pnx4008/core.c
index 3ba46ede9bbd..45734bb880a8 100644
--- a/arch/arm/mach-pnx4008/core.c
+++ b/arch/arm/mach-pnx4008/core.c
@@ -25,9 +25,9 @@
 #include <linux/serial_8250.h>
 #include <linux/device.h>
 #include <linux/spi/spi.h>
+#include <linux/io.h>
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/pgtable.h>
diff --git a/arch/arm/mach-pnx4008/dma.c b/arch/arm/mach-pnx4008/dma.c
index 833c56be7344..ac2f70eddb9e 100644
--- a/arch/arm/mach-pnx4008/dma.c
+++ b/arch/arm/mach-pnx4008/dma.c
@@ -21,12 +21,12 @@
 #include <linux/err.h>
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
+#include <linux/io.h>
 #include <asm/system.h>
 #include <mach/hardware.h>
 #include <asm/dma.h>
 #include <asm/dma-mapping.h>
-#include <asm/io.h>
 #include <asm/mach/dma.h>
 #include <mach/clock.h>
diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c
index fb51f7279e95..015cc21d5f55 100644
--- a/arch/arm/mach-pnx4008/gpio.c
+++ b/arch/arm/mach-pnx4008/gpio.c
@@ -17,7 +17,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/platform.h>
 #include <mach/gpio.h>
diff --git a/arch/arm/mach-pnx4008/include/mach/system.h b/arch/arm/mach-pnx4008/include/mach/system.h
index 8985a4622b8c..e12e7abfcbcf 100644
--- a/arch/arm/mach-pnx4008/include/mach/system.h
+++ b/arch/arm/mach-pnx4008/include/mach/system.h
@@ -21,8 +21,8 @@
 #ifndef __ASM_ARCH_SYSTEM_H
 #define __ASM_ARCH_SYSTEM_H
+#include <linux/io.h>
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <mach/platform.h>
 static void arch_idle(void)
diff --git a/arch/arm/mach-pnx4008/include/mach/timex.h b/arch/arm/mach-pnx4008/include/mach/timex.h
index 956fbd8e977c..5ff0196c0f16 100644
--- a/arch/arm/mach-pnx4008/include/mach/timex.h
+++ b/arch/arm/mach-pnx4008/include/mach/timex.h
@@ -14,8 +14,8 @@
 #ifndef __PNX4008_TIMEX_H
 #define __PNX4008_TIMEX_H
+#include <linux/io.h>
 #include <mach/hardware.h>
-#include <asm/io.h>
 #define CLOCK_TICK_RATE         1000000
diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c
index 5c4f55af5d4b..a9ce02b4bf17 100644
--- a/arch/arm/mach-pnx4008/irq.c
+++ b/arch/arm/mach-pnx4008/irq.c
@@ -23,8 +23,8 @@
 #include <linux/ioport.h>
 #include <linux/device.h>
 #include <linux/irq.h>
+#include <linux/io.h>
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c
index f970906d8848..b3d8d53e32ef 100644
--- a/arch/arm/mach-pnx4008/pm.c
+++ b/arch/arm/mach-pnx4008/pm.c
@@ -18,8 +18,8 @@
 #include <linux/suspend.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
+#include <linux/io.h>
-#include <asm/io.h>
 #include <asm/cacheflush.h>
 #include <mach/pm.h>
 #include <mach/clock.h>
diff --git a/arch/arm/mach-pnx4008/serial.c b/arch/arm/mach-pnx4008/serial.c
index 9be84bbb30e8..f40961e51914 100644
--- a/arch/arm/mach-pnx4008/serial.c
+++ b/arch/arm/mach-pnx4008/serial.c
@@ -12,8 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/io.h>
-#include <asm/io.h>
 #include <mach/platform.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c
index 180975244f96..fc0ba183fe12 100644
--- a/arch/arm/mach-pnx4008/time.c
+++ b/arch/arm/mach-pnx4008/time.c
@@ -22,10 +22,10 @@
 #include <linux/time.h>
 #include <linux/timex.h>
 #include <linux/irq.h>
+#include <linux/io.h>
 #include <asm/system.h>
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/leds.h>
 #include <asm/mach/time.h>
 #include <asm/errno.h>
author	Russell King <rmk@dyn-67.arm.linux.org.uk>	2008-09-06 07:10:45 -0400
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2008-09-06 07:10:45 -0400
commit	fced80c735941fa518ac67c0b61bbe153fb8c050 (patch)
tree	16f3abeb03e8c164108873bc5aab660a506577c5 /arch/arm/mach-pnx4008
parent	33fa9b13285e76fb95d940120964562e4c7081c2 (diff)

diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c index 24d036a24a72..898c0e88acbc 100644 --- a/arch/arm/mach-pnx4008/clock.c +++ b/arch/arm/mach-pnx4008/clock.c
@@ -20,9 +20,9 @@
20	#include <linux/device.h>	20	#include <linux/device.h>
21	#include <linux/err.h>	21	#include <linux/err.h>
22	#include <linux/delay.h>	22	#include <linux/delay.h>
		23	#include <linux/io.h>
23		24
24	#include <mach/hardware.h>	25	#include <mach/hardware.h>
25	#include <asm/io.h>
26		26
27	#include <mach/clock.h>	27	#include <mach/clock.h>
28	#include "clock.h"	28	#include "clock.h"


diff --git a/arch/arm/mach-pnx4008/core.c b/arch/arm/mach-pnx4008/core.c index 3ba46ede9bbd..45734bb880a8 100644 --- a/arch/arm/mach-pnx4008/core.c +++ b/arch/arm/mach-pnx4008/core.c
@@ -25,9 +25,9 @@
25	#include <linux/serial_8250.h>	25	#include <linux/serial_8250.h>
26	#include <linux/device.h>	26	#include <linux/device.h>
27	#include <linux/spi/spi.h>	27	#include <linux/spi/spi.h>
		28	#include <linux/io.h>
28		29
29	#include <mach/hardware.h>	30	#include <mach/hardware.h>
30	#include <asm/io.h>
31	#include <asm/setup.h>	31	#include <asm/setup.h>
32	#include <asm/mach-types.h>	32	#include <asm/mach-types.h>
33	#include <asm/pgtable.h>	33	#include <asm/pgtable.h>


diff --git a/arch/arm/mach-pnx4008/dma.c b/arch/arm/mach-pnx4008/dma.c index 833c56be7344..ac2f70eddb9e 100644 --- a/arch/arm/mach-pnx4008/dma.c +++ b/arch/arm/mach-pnx4008/dma.c
@@ -21,12 +21,12 @@
21	#include <linux/err.h>	21	#include <linux/err.h>
22	#include <linux/dma-mapping.h>	22	#include <linux/dma-mapping.h>
23	#include <linux/clk.h>	23	#include <linux/clk.h>
		24	#include <linux/io.h>
24		25
25	#include <asm/system.h>	26	#include <asm/system.h>
26	#include <mach/hardware.h>	27	#include <mach/hardware.h>
27	#include <asm/dma.h>	28	#include <asm/dma.h>
28	#include <asm/dma-mapping.h>	29	#include <asm/dma-mapping.h>
29	#include <asm/io.h>
30	#include <asm/mach/dma.h>	30	#include <asm/mach/dma.h>
31	#include <mach/clock.h>	31	#include <mach/clock.h>
32		32


diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c index fb51f7279e95..015cc21d5f55 100644 --- a/arch/arm/mach-pnx4008/gpio.c +++ b/arch/arm/mach-pnx4008/gpio.c
@@ -17,7 +17,7 @@
17	#include <linux/types.h>	17	#include <linux/types.h>
18	#include <linux/kernel.h>	18	#include <linux/kernel.h>
19	#include <linux/module.h>	19	#include <linux/module.h>
20	#include <asm/io.h>	20	#include <linux/io.h>
21	#include <mach/platform.h>	21	#include <mach/platform.h>
22	#include <mach/gpio.h>	22	#include <mach/gpio.h>
23		23


diff --git a/arch/arm/mach-pnx4008/include/mach/system.h b/arch/arm/mach-pnx4008/include/mach/system.h index 8985a4622b8c..e12e7abfcbcf 100644 --- a/arch/arm/mach-pnx4008/include/mach/system.h +++ b/arch/arm/mach-pnx4008/include/mach/system.h
@@ -21,8 +21,8 @@
21	#ifndef __ASM_ARCH_SYSTEM_H	21	#ifndef __ASM_ARCH_SYSTEM_H
22	#define __ASM_ARCH_SYSTEM_H	22	#define __ASM_ARCH_SYSTEM_H
23		23
		24	#include <linux/io.h>
24	#include <mach/hardware.h>	25	#include <mach/hardware.h>
25	#include <asm/io.h>
26	#include <mach/platform.h>	26	#include <mach/platform.h>
27		27
28	static void arch_idle(void)	28	static void arch_idle(void)


diff --git a/arch/arm/mach-pnx4008/include/mach/timex.h b/arch/arm/mach-pnx4008/include/mach/timex.h index 956fbd8e977c..5ff0196c0f16 100644 --- a/arch/arm/mach-pnx4008/include/mach/timex.h +++ b/arch/arm/mach-pnx4008/include/mach/timex.h
@@ -14,8 +14,8 @@
14	#ifndef __PNX4008_TIMEX_H	14	#ifndef __PNX4008_TIMEX_H
15	#define __PNX4008_TIMEX_H	15	#define __PNX4008_TIMEX_H
16		16
		17	#include <linux/io.h>
17	#include <mach/hardware.h>	18	#include <mach/hardware.h>
18	#include <asm/io.h>
19		19
20	#define CLOCK_TICK_RATE 1000000	20	#define CLOCK_TICK_RATE 1000000
21		21


diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c index 5c4f55af5d4b..a9ce02b4bf17 100644 --- a/arch/arm/mach-pnx4008/irq.c +++ b/arch/arm/mach-pnx4008/irq.c
@@ -23,8 +23,8 @@
23	#include <linux/ioport.h>	23	#include <linux/ioport.h>
24	#include <linux/device.h>	24	#include <linux/device.h>
25	#include <linux/irq.h>	25	#include <linux/irq.h>
		26	#include <linux/io.h>
26	#include <mach/hardware.h>	27	#include <mach/hardware.h>
27	#include <asm/io.h>
28	#include <asm/setup.h>	28	#include <asm/setup.h>
29	#include <asm/pgtable.h>	29	#include <asm/pgtable.h>
30	#include <asm/page.h>	30	#include <asm/page.h>


diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c index f970906d8848..b3d8d53e32ef 100644 --- a/arch/arm/mach-pnx4008/pm.c +++ b/arch/arm/mach-pnx4008/pm.c
@@ -18,8 +18,8 @@
18	#include <linux/suspend.h>	18	#include <linux/suspend.h>
19	#include <linux/delay.h>	19	#include <linux/delay.h>
20	#include <linux/clk.h>	20	#include <linux/clk.h>
		21	#include <linux/io.h>
21		22
22	#include <asm/io.h>
23	#include <asm/cacheflush.h>	23	#include <asm/cacheflush.h>
24	#include <mach/pm.h>	24	#include <mach/pm.h>
25	#include <mach/clock.h>	25	#include <mach/clock.h>


diff --git a/arch/arm/mach-pnx4008/serial.c b/arch/arm/mach-pnx4008/serial.c index 9be84bbb30e8..f40961e51914 100644 --- a/arch/arm/mach-pnx4008/serial.c +++ b/arch/arm/mach-pnx4008/serial.c
@@ -12,8 +12,7 @@
12		12
13	#include <linux/kernel.h>	13	#include <linux/kernel.h>
14	#include <linux/types.h>	14	#include <linux/types.h>
15		15	#include <linux/io.h>
16	#include <asm/io.h>
17		16
18	#include <mach/platform.h>	17	#include <mach/platform.h>
19	#include <mach/hardware.h>	18	#include <mach/hardware.h>


diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c index 180975244f96..fc0ba183fe12 100644 --- a/arch/arm/mach-pnx4008/time.c +++ b/arch/arm/mach-pnx4008/time.c
@@ -22,10 +22,10 @@
22	#include <linux/time.h>	22	#include <linux/time.h>
23	#include <linux/timex.h>	23	#include <linux/timex.h>
24	#include <linux/irq.h>	24	#include <linux/irq.h>
		25	#include <linux/io.h>
25		26
26	#include <asm/system.h>	27	#include <asm/system.h>
27	#include <mach/hardware.h>	28	#include <mach/hardware.h>
28	#include <asm/io.h>
29	#include <asm/leds.h>	29	#include <asm/leds.h>
30	#include <asm/mach/time.h>	30	#include <asm/mach/time.h>
31	#include <asm/errno.h>	31	#include <asm/errno.h>