Merge branch 'for-next' into for-linus

[net-next-2.6.git] / arch / arm / mach-omap2 / board-3630sdp.c

diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c
index 7390596328116b2972c1e3ceb6c232c283003d1f..4386d2b4a785dcceaaecacb245024442312464d0 100644 (file)
--- a/arch/arm/mach-omap2/board-3630sdp.c
+++ b/arch/arm/mach-omap2/board-3630sdp.c
@@ -68,8 +68,8 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 
 static void __init omap_sdp_map_io(void)
 {
-       omap2_set_globals_343x();
-       omap2_map_common_io();
+       omap2_set_globals_36xx();
+       omap34xx_map_common_io();
 }
 
 static struct omap_board_config_kernel sdp_config[] __initdata = {