diff options
author | Tony Lindgren <tony@atomide.com> | 2005-07-10 14:58:17 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-10 14:58:17 -0400 |
commit | d48af15ea7227d633ddd5002223c2b122b1032e1 (patch) | |
tree | 15cd2bb63a592bd00b9a83def1a6c5546e923fe4 /arch/arm/mach-omap1/board-perseus2.c | |
parent | 5e1c5ff4783e0ddd241580c9996390508722190e (diff) |
[PATCH] ARM: 2802/1: OMAP update 8/11: Update OMAP arch files
Patch from Tony Lindgren
This patch by various OMAP developers syncs the OMAP
specific arch files with the linux-omap tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap1/board-perseus2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 0d460522fcaf..213317392d9b 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -27,8 +27,7 @@ | |||
27 | #include <asm/arch/gpio.h> | 27 | #include <asm/arch/gpio.h> |
28 | #include <asm/arch/mux.h> | 28 | #include <asm/arch/mux.h> |
29 | #include <asm/arch/fpga.h> | 29 | #include <asm/arch/fpga.h> |
30 | 30 | #include <asm/arch/common.h> | |
31 | #include "common.h" | ||
32 | 31 | ||
33 | static struct resource smc91x_resources[] = { | 32 | static struct resource smc91x_resources[] = { |
34 | [0] = { | 33 | [0] = { |
@@ -140,7 +139,7 @@ static struct map_desc omap_perseus2_io_desc[] __initdata = { | |||
140 | 139 | ||
141 | static void __init omap_perseus2_map_io(void) | 140 | static void __init omap_perseus2_map_io(void) |
142 | { | 141 | { |
143 | omap_map_io(); | 142 | omap_map_common_io(); |
144 | iotable_init(omap_perseus2_io_desc, | 143 | iotable_init(omap_perseus2_io_desc, |
145 | ARRAY_SIZE(omap_perseus2_io_desc)); | 144 | ARRAY_SIZE(omap_perseus2_io_desc)); |
146 | 145 | ||