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-h3.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-h3.c')
-rw-r--r-- | arch/arm/mach-omap1/board-h3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 3ff6eb8c8f2a..7cd419d61b40 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
@@ -37,8 +37,7 @@ | |||
37 | #include <asm/arch/mux.h> | 37 | #include <asm/arch/mux.h> |
38 | #include <asm/arch/tc.h> | 38 | #include <asm/arch/tc.h> |
39 | #include <asm/arch/usb.h> | 39 | #include <asm/arch/usb.h> |
40 | 40 | #include <asm/arch/common.h> | |
41 | #include "common.h" | ||
42 | 41 | ||
43 | extern int omap_gpio_init(void); | 42 | extern int omap_gpio_init(void); |
44 | 43 | ||
@@ -190,7 +189,7 @@ void h3_init_irq(void) | |||
190 | 189 | ||
191 | static void __init h3_map_io(void) | 190 | static void __init h3_map_io(void) |
192 | { | 191 | { |
193 | omap_map_io(); | 192 | omap_map_common_io(); |
194 | omap_serial_init(h3_serial_ports); | 193 | omap_serial_init(h3_serial_ports); |
195 | } | 194 | } |
196 | 195 | ||