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-osk.c | |
| parent | [PATCH] ARM: 2812/1: OMAP update 7c/11: Move arch-omap to plat-omap (diff) | |
| download | linux-dev-d48af15ea7227d633ddd5002223c2b122b1032e1.tar.xz linux-dev-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-osk.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index b9e3273ac0b0..6844e536c698 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -39,8 +39,7 @@ #include <asm/arch/usb.h> #include <asm/arch/mux.h> #include <asm/arch/tc.h> - -#include "common.h" +#include <asm/arch/common.h> static struct map_desc osk5912_io_desc[] __initdata = { { OMAP_OSK_NOR_FLASH_BASE, OMAP_OSK_NOR_FLASH_START, OMAP_OSK_NOR_FLASH_SIZE, @@ -153,7 +152,7 @@ static void __init osk_init(void) static void __init osk_map_io(void) { - omap_map_io(); + omap_map_common_io(); iotable_init(osk5912_io_desc, ARRAY_SIZE(osk5912_io_desc)); omap_serial_init(osk_serial_ports); } |