USB: musb: Refer to musb_otg_timer_func under correct #ifdef
authorAmit Kucheria <amit.kucheria@canonical.com>
Mon, 27 Jul 2009 09:03:19 +0000 (12:03 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 28 Jul 2009 21:31:11 +0000 (14:31 -0700)
musb_otg_timer_func() is defined under #ifdef CONFIG_USB_MUSB_OTG.
Make sure any reference to it is also under the same #ifdef.

Without this fix, the driver failes to compile when USB_OTG is defined
but USB_MUSB_OTG isn't.

Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/musb/musb_core.c

index 554a414f65d1104cbbbeeaed2885f2a209faf42d..642a4e25f7d944f3a548578592ea68fe526cb63d 100644 (file)
@@ -1990,7 +1990,7 @@ bad_config:
        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