Fix N800 booting

Fix bad extern patch and undo some automerge damage to
io.c

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 5fa7fc2..871fde3 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -42,48 +42,10 @@ static struct map_desc omap2_io_desc[] __initdata = {
                .length         = L3_24XX_SIZE,
                .type           = MT_DEVICE
        },
-#ifdef CONFIG_ARCH_OMAP2430
        {
-               .virtual        = L4_WK_243X_VIRT,
-               .pfn            = __phys_to_pfn(L4_WK_243X_PHYS),
-               .length         = L4_WK_243X_SIZE,
-               .type           = MT_DEVICE
-       },
-       {
-               .virtual        = OMAP243X_GPMC_VIRT,
-               .pfn            = __phys_to_pfn(OMAP243X_GPMC_PHYS),
-               .length         = OMAP243X_GPMC_SIZE,
-               .type           = MT_DEVICE
-       },
-       {
-               .virtual        = OMAP243X_SDRC_VIRT,
-               .pfn            = __phys_to_pfn(OMAP243X_SDRC_PHYS),
-               .length         = OMAP243X_SDRC_SIZE,
-               .type           = MT_DEVICE
-       },
-       {
-               .virtual        = OMAP243X_SMS_VIRT,
-               .pfn            = __phys_to_pfn(OMAP243X_SMS_PHYS),
-               .length         = OMAP243X_SMS_SIZE,
-               .type           = MT_DEVICE
-       },
-#endif
-       {
-               .virtual        = DSP_MEM_24XX_VIRT,
-               .pfn            = __phys_to_pfn(DSP_MEM_24XX_PHYS),
-               .length         = DSP_MEM_24XX_SIZE,
-               .type           = MT_DEVICE
-       },
-       {
-               .virtual        = DSP_IPI_24XX_VIRT,
-               .pfn            = __phys_to_pfn(DSP_IPI_24XX_PHYS),
-               .length         = DSP_IPI_24XX_SIZE,
-               .type           = MT_DEVICE
-       },
-       {
-               .virtual        = DSP_MMU_24XX_VIRT,
-               .pfn            = __phys_to_pfn(DSP_MMU_24XX_PHYS),
-               .length         = DSP_MMU_24XX_SIZE,
+               .virtual        = L4_24XX_VIRT,
+               .pfn            = __phys_to_pfn(L4_24XX_PHYS),
+               .length         = L4_24XX_SIZE,
                .type           = MT_DEVICE
        },
 #ifdef CONFIG_ARCH_OMAP2430

diff --cc include/asm-arm/arch-omap/board-nokia.h
Simple merge