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/include | |
| 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/include')
| -rw-r--r-- | arch/arm/include/asm/mc146818rtc.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/vga.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mc146818rtc.h b/arch/arm/include/asm/mc146818rtc.h index e1ca48a9e973..6b884d2b0b69 100644 --- a/arch/arm/include/asm/mc146818rtc.h +++ b/arch/arm/include/asm/mc146818rtc.h | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | #ifndef _ASM_MC146818RTC_H | 4 | #ifndef _ASM_MC146818RTC_H |
| 5 | #define _ASM_MC146818RTC_H | 5 | #define _ASM_MC146818RTC_H |
| 6 | 6 | ||
| 7 | #include <linux/io.h> | ||
| 7 | #include <mach/irqs.h> | 8 | #include <mach/irqs.h> |
| 8 | #include <asm/io.h> | ||
| 9 | 9 | ||
| 10 | #ifndef RTC_PORT | 10 | #ifndef RTC_PORT |
| 11 | #define RTC_PORT(x) (0x70 + (x)) | 11 | #define RTC_PORT(x) (0x70 + (x)) |
diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h index 6a3cd2a2f670..250a4dd00630 100644 --- a/arch/arm/include/asm/vga.h +++ b/arch/arm/include/asm/vga.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | #ifndef ASMARM_VGA_H | 1 | #ifndef ASMARM_VGA_H |
| 2 | #define ASMARM_VGA_H | 2 | #define ASMARM_VGA_H |
| 3 | 3 | ||
| 4 | #include <linux/io.h> | ||
| 4 | #include <mach/hardware.h> | 5 | #include <mach/hardware.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)) |
| 8 | 8 | ||