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-loki | |
| 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-loki')
| -rw-r--r-- | arch/arm/mach-loki/addr-map.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-loki/irq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-loki/addr-map.c b/arch/arm/mach-loki/addr-map.c index 70ca56bb6f33..0332d8f5c18c 100644 --- a/arch/arm/mach-loki/addr-map.c +++ b/arch/arm/mach-loki/addr-map.c | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/mbus.h> | 13 | #include <linux/mbus.h> |
| 14 | #include <linux/io.h> | ||
| 14 | #include <mach/hardware.h> | 15 | #include <mach/hardware.h> |
| 15 | #include <asm/io.h> | ||
| 16 | #include "common.h" | 16 | #include "common.h" |
| 17 | 17 | ||
| 18 | /* | 18 | /* |
diff --git a/arch/arm/mach-loki/irq.c b/arch/arm/mach-loki/irq.c index 5a487930cb2f..e1f97338d5b7 100644 --- a/arch/arm/mach-loki/irq.c +++ b/arch/arm/mach-loki/irq.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
| 14 | #include <asm/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <plat/irq.h> | 15 | #include <plat/irq.h> |
| 16 | #include "common.h" | 16 | #include "common.h" |
| 17 | 17 | ||