Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / mach-omap2 / omap_hwmod_44xx_data.c

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 1e2993883b4facae1b82b57aa375016d71e16bef..0e47d2e1687c76004ea7449b8e496340617b09d1 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2703,13 +2703,6 @@ static struct resource omap44xx_usb_phy_and_pll_addrs[] = {
                .end            = 0x4a0ae000,
                .flags          = IORESOURCE_MEM,
        },
-       {
-               /* XXX: Remove this once control module driver is in place */
-               .name           = "ctrl_dev",
-               .start          = 0x4a002300,
-               .end            = 0x4a002303,
-               .flags          = IORESOURCE_MEM,
-       },
        { }
 };
 
@@ -6198,12 +6191,6 @@ static struct omap_hwmod_addr_space omap44xx_usb_otg_hs_addrs[] = {
                .pa_end         = 0x4a0ab7ff,
                .flags          = ADDR_TYPE_RT
        },
-       {
-               /* XXX: Remove this once control module driver is in place */
-               .pa_start       = 0x4a00233c,
-               .pa_end         = 0x4a00233f,
-               .flags          = ADDR_TYPE_RT
-       },
        { }
 };