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-omap1/mux.c | |
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-omap1/mux.c')
-rw-r--r-- | arch/arm/mach-omap1/mux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c index 898516e362e7..062c905c2ba6 100644 --- a/arch/arm/mach-omap1/mux.c +++ b/arch/arm/mach-omap1/mux.c | |||
@@ -24,10 +24,11 @@ | |||
24 | */ | 24 | */ |
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <asm/system.h> | 27 | #include <linux/io.h> |
28 | #include <asm/io.h> | ||
29 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
30 | 29 | ||
30 | #include <asm/system.h> | ||
31 | |||
31 | #include <mach/mux.h> | 32 | #include <mach/mux.h> |
32 | 33 | ||
33 | #ifdef CONFIG_OMAP_MUX | 34 | #ifdef CONFIG_OMAP_MUX |