Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus

[safe/jmp/linux-2.6] / arch / arm / mach-omap2 / io.c

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 303d5c2..402e8f0 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -137,12 +137,6 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
                .type           = MT_DEVICE
        },
        {
-               .virtual        = L4_WK_34XX_VIRT,
-               .pfn            = __phys_to_pfn(L4_WK_34XX_PHYS),
-               .length         = L4_WK_34XX_SIZE,
-               .type           = MT_DEVICE
-       },
-       {
                .virtual        = OMAP34XX_GPMC_VIRT,
                .pfn            = __phys_to_pfn(OMAP34XX_GPMC_PHYS),
                .length         = OMAP34XX_GPMC_SIZE,
@@ -189,12 +183,6 @@ static struct map_desc omap44xx_io_desc[] __initdata = {
                .type           = MT_DEVICE,
        },
        {
-               .virtual        = L4_WK_44XX_VIRT,
-               .pfn            = __phys_to_pfn(L4_WK_44XX_PHYS),
-               .length         = L4_WK_44XX_SIZE,
-               .type           = MT_DEVICE,
-       },
-       {
                .virtual        = OMAP44XX_GPMC_VIRT,
                .pfn            = __phys_to_pfn(OMAP44XX_GPMC_PHYS),
                .length         = OMAP44XX_GPMC_SIZE,