diff options
| author | Tony Lindgren <tony@atomide.com> | 2005-07-10 19:58:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-10 19:58:17 +0100 |
| commit | d48af15ea7227d633ddd5002223c2b122b1032e1 (patch) | |
| tree | 15cd2bb63a592bd00b9a83def1a6c5546e923fe4 /arch/arm/mach-omap1/board-generic.c | |
| parent | 5e1c5ff4783e0ddd241580c9996390508722190e (diff) | |
| download | blackbird-op-linux-d48af15ea7227d633ddd5002223c2b122b1032e1.tar.gz blackbird-op-linux-d48af15ea7227d633ddd5002223c2b122b1032e1.zip | |
[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-generic.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-generic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index e2d338488d10..122796ebe8f5 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -26,8 +26,7 @@ #include <asm/arch/mux.h> #include <asm/arch/usb.h> #include <asm/arch/board.h> - -#include "common.h" +#include <asm/arch/common.h> static int __initdata generic_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1}; @@ -84,7 +83,7 @@ static void __init omap_generic_init(void) static void __init omap_generic_map_io(void) { - omap_map_io(); + omap_map_common_io() } MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") |
