Commit 861bd81ee6 in linux-next as of 20101018 (arm: remove machine_desc.io_pg_offst and .phys_io) missed out on updating a few boards. This causes the build of omap2plus_defconfig to fail. Fix this.
Signed-off-by: Anand Gadiyar <[email protected]> Cc: Nicolas Pitre <[email protected]> Cc: Eric Miao <eric.miao at canonical.com> Cc: Tony Lindgren <[email protected]> --- I've not boot tested on these three boards, and am simply following what the original patch does. arch/arm/mach-omap2/board-cm-t3517.c | 2 -- arch/arm/mach-omap2/board-igep0030.c | 2 -- arch/arm/mach-omap2/board-omap3logic.c | 4 ---- 3 files changed, 8 deletions(-) Index: mainline/arch/arm/mach-omap2/board-cm-t3517.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-cm-t3517.c +++ mainline/arch/arm/mach-omap2/board-cm-t3517.c @@ -283,8 +283,6 @@ static void __init cm_t3517_init(void) } MACHINE_START(CM_T3517, "Compulab CM-T3517") - .phys_io = 0x48000000, - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, .boot_params = 0x80000100, .map_io = omap3_map_io, .reserve = omap_reserve, Index: mainline/arch/arm/mach-omap2/board-igep0030.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-igep0030.c +++ mainline/arch/arm/mach-omap2/board-igep0030.c @@ -392,8 +392,6 @@ static void __init igep3_init(void) } MACHINE_START(IGEP0030, "IGEP OMAP3 module") - .phys_io = 0x48000000, - .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, .map_io = omap3_map_io, .init_irq = igep3_init_irq, Index: mainline/arch/arm/mach-omap2/board-omap3logic.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-omap3logic.c +++ mainline/arch/arm/mach-omap2/board-omap3logic.c @@ -225,8 +225,6 @@ static void __init omap3logic_init(void) } MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") - .phys_io = 0x48000000, - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, .boot_params = 0x80000100, .map_io = omap3_map_io, .init_irq = omap3logic_init_irq, @@ -235,8 +233,6 @@ MACHINE_START(OMAP3_TORPEDO, "Logic OMAP MACHINE_END MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board") - .phys_io = 0x48000000, - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, .boot_params = 0x80000100, .map_io = omap3_map_io, .init_irq = omap3logic_init_irq, -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
