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-voiceblue.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-voiceblue.c')
-rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index d882f43658a0..e42281988990 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
@@ -31,8 +31,7 @@ | |||
31 | #include <asm/arch/tc.h> | 31 | #include <asm/arch/tc.h> |
32 | #include <asm/arch/mux.h> | 32 | #include <asm/arch/mux.h> |
33 | #include <asm/arch/usb.h> | 33 | #include <asm/arch/usb.h> |
34 | 34 | #include <asm/arch/common.h> | |
35 | #include "common.h" | ||
36 | 35 | ||
37 | extern void omap_init_time(void); | 36 | extern void omap_init_time(void); |
38 | extern int omap_gpio_init(void); | 37 | extern int omap_gpio_init(void); |
@@ -170,7 +169,7 @@ static int __initdata omap_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1}; | |||
170 | 169 | ||
171 | static void __init voiceblue_map_io(void) | 170 | static void __init voiceblue_map_io(void) |
172 | { | 171 | { |
173 | omap_map_io(); | 172 | omap_map_common_io(); |
174 | omap_serial_init(omap_serial_ports); | 173 | omap_serial_init(omap_serial_ports); |
175 | } | 174 | } |
176 | 175 | ||