---

yaml --- r: 155949 b: refs/heads/master c: 3a9f5bd h: refs/heads/master i: 155947: c3e41a5 v: v3
git-mirror · Jul 28, 2009 · 935a5c3 · 935a5c3
1 parent 6645e41
commit 935a5c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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