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-h2.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-h2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 02c7e335d3ef..f4983ee95ab4 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -35,8 +35,7 @@ | |||
35 | #include <asm/arch/gpio.h> | 35 | #include <asm/arch/gpio.h> |
36 | #include <asm/arch/tc.h> | 36 | #include <asm/arch/tc.h> |
37 | #include <asm/arch/usb.h> | 37 | #include <asm/arch/usb.h> |
38 | 38 | #include <asm/arch/common.h> | |
39 | #include "common.h" | ||
40 | 39 | ||
41 | extern int omap_gpio_init(void); | 40 | extern int omap_gpio_init(void); |
42 | 41 | ||
@@ -172,7 +171,7 @@ static void __init h2_init(void) | |||
172 | 171 | ||
173 | static void __init h2_map_io(void) | 172 | static void __init h2_map_io(void) |
174 | { | 173 | { |
175 | omap_map_io(); | 174 | omap_map_common_io(); |
176 | omap_serial_init(h2_serial_ports); | 175 | omap_serial_init(h2_serial_ports); |
177 | } | 176 | } |
178 | 177 | ||