From 1b56a121b501629c9975e0be26fca83307163b49 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Wed, 20 Jun 2012 07:18:15 -0700
Subject: [PATCH] --- yaml --- r: 311222 b: refs/heads/master c:
 3d09b33fecf204561e5c7126648ec05c756c631c h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/mach-omap2/usb-tusb6010.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e6124a643d02..b7ac34e524f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 310018d52ec06c19dc946c2807c07c8b70e2d1a6
+refs/heads/master: 3d09b33fecf204561e5c7126648ec05c756c631c
diff --git a/trunk/arch/arm/mach-omap2/usb-tusb6010.c b/trunk/arch/arm/mach-omap2/usb-tusb6010.c
index db84a46ce7fd..805bea6edf17 100644
--- a/trunk/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/trunk/arch/arm/mach-omap2/usb-tusb6010.c
@@ -300,7 +300,7 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data,
 		printk(error, 3, status);
 		return status;
 	}
-	tusb_resources[2].start = irq + IH_GPIO_BASE;
+	tusb_resources[2].start = gpio_to_irq(irq);
 
 	/* set up memory timings ... can speed them up later */
 	if (!ps_refclk) {