diff options
| 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-ns9xxx | |
| parent | 33fa9b13285e76fb95d940120964562e4c7081c2 (diff) | |
[ARM] Convert asm/io.h to linux/io.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ns9xxx')
| -rw-r--r-- | arch/arm/mach-ns9xxx/include/mach/uncompress.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ns9xxx/irq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ns9xxx/include/mach/uncompress.h b/arch/arm/mach-ns9xxx/include/mach/uncompress.h index 5dbc3c5167c8..1b12d324b087 100644 --- a/arch/arm/mach-ns9xxx/include/mach/uncompress.h +++ b/arch/arm/mach-ns9xxx/include/mach/uncompress.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #ifndef __ASM_ARCH_UNCOMPRESS_H | 11 | #ifndef __ASM_ARCH_UNCOMPRESS_H |
| 12 | #define __ASM_ARCH_UNCOMPRESS_H | 12 | #define __ASM_ARCH_UNCOMPRESS_H |
| 13 | 13 | ||
| 14 | #include <asm/io.h> | 14 | #include <linux/io.h> |
| 15 | 15 | ||
| 16 | #define __REG(x) ((void __iomem __force *)(x)) | 16 | #define __REG(x) ((void __iomem __force *)(x)) |
| 17 | 17 | ||
diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c index 38260d5f849b..22e0eb6e9ec4 100644 --- a/arch/arm/mach-ns9xxx/irq.c +++ b/arch/arm/mach-ns9xxx/irq.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 12 | #include <linux/kernel_stat.h> | 12 | #include <linux/kernel_stat.h> |
| 13 | #include <asm/io.h> | 13 | #include <linux/io.h> |
| 14 | #include <asm/mach/irq.h> | 14 | #include <asm/mach/irq.h> |
| 15 | #include <mach/regs-sys-common.h> | 15 | #include <mach/regs-sys-common.h> |
| 16 | #include <mach/irqs.h> | 16 | #include <mach/irqs.h> |