From 935a5c30ae70fe235e9d22a9055af05197a5baab Mon Sep 17 00:00:00 2001
From: Amit Kucheria <amit.kucheria@canonical.com>
Date: Mon, 27 Jul 2009 12:03:19 +0300
Subject: [PATCH] --- yaml --- r: 155949 b: refs/heads/master c:
 3a9f5bd82dc986d496d8484ff54b107b4515f43f h: refs/heads/master i:   155947:
 c3e41a503bd19d9ec837572eb07abf3cf14f5234 v: v3

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

diff --git a/[refs] b/[refs]
index 4257ef7d3b00..80669cf3b0af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f01b017d198486ee3553bee6841f788263cf2c23
+refs/heads/master: 3a9f5bd82dc986d496d8484ff54b107b4515f43f
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
index 554a414f65d1..642a4e25f7d9 100644
--- a/trunk/drivers/usb/musb/musb_core.c
+++ b/trunk/drivers/usb/musb/musb_core.c
@@ -1990,7 +1990,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 	if (status < 0)
 		goto fail2;
 
-#ifdef CONFIG_USB_OTG
+#ifdef CONFIG_USB_MUSB_OTG
 	setup_timer(&musb->otg_timer, musb_otg_timer_func, (unsigned long) musb);
 #endif