From b57a394c0c368711f6b46a0570e1a831229de263 Mon Sep 17 00:00:00 2001
From: Maulik Mankad <x0082077@ti.com>
Date: Tue, 15 Jun 2010 14:40:27 +0530
Subject: [PATCH] --- yaml --- r: 200673 b: refs/heads/master c:
 2bb14cbf04ded4b9e394a6ba9e4f06b82fbac8b2 h: refs/heads/master i:   200671:
 8833c4afad3c20124bdb7de91bbd1411fa0dd7a4 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/musb/musb_core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fb92154bd3a0..b2c3797759ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5797a686f4c7cbced782959509d735cfa1344b1
+refs/heads/master: 2bb14cbf04ded4b9e394a6ba9e4f06b82fbac8b2
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
index fad70bc83555..56b6debaf2d9 100644
--- a/trunk/drivers/usb/musb/musb_core.c
+++ b/trunk/drivers/usb/musb/musb_core.c
@@ -642,7 +642,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 		handled = IRQ_HANDLED;
 	}
 
-
+#endif
 	if (int_usb & MUSB_INTR_SUSPEND) {
 		DBG(1, "SUSPEND (%s) devctl %02x power %02x\n",
 				otg_state_string(musb), devctl, power);
@@ -705,6 +705,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 		}
 	}
 
+#ifdef CONFIG_USB_MUSB_HDRC_HCD
 	if (int_usb & MUSB_INTR_CONNECT) {
 		struct usb_hcd *hcd = musb_to_hcd(musb);
 		void __iomem *mbase = musb->mregs;