From 92e68d6a3ea2f65b2c959e46795384ba41167d20 Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Wed, 6 Feb 2013 18:58:47 +0530
Subject: [PATCH] --- yaml --- r: 354719 b: refs/heads/master c:
 5b9479e9f15d98ce7bc43eb39472a86e51cc2c27 h: refs/heads/master i:   354717:
 b67aed79094d3527e6d1567522fa505e025104fc   354715:
 29ffdcf1b4f9bf2ce3c84d6e9eb702fc03961fc8   354711:
 62ebe44ffbaa393663f37a98b6c99e02a2e0a10b   354703:
 604d8911670b00ab93f31813554f184122a50fb7   354687:
 2702aa0d1786d62c9e7d7ee1468715e3e7e60c84 v: v3

---
 [refs]                                           |  2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 45f42e37f2bd..10d9b16b26a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f07af4b630d52fb911574031ed7feb9252e65f24
+refs/heads/master: 5b9479e9f15d98ce7bc43eb39472a86e51cc2c27
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 793f54ac7d14..624a7e84a685 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2702,13 +2702,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,
-	},
 	{ }
 };
 
@@ -6156,12 +6149,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
-	},
 	{ }
 };