diff options
| author | Amit Kucheria <amit.kucheria@canonical.com> | 2009-07-27 12:03:19 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-28 14:31:11 -0700 |
| commit | 3a9f5bd82dc986d496d8484ff54b107b4515f43f (patch) | |
| tree | 1007f3981ee90ba48fa00cc6f3533b8b9a02b9a5 /drivers/usb | |
| parent | f01b017d198486ee3553bee6841f788263cf2c23 (diff) | |
| download | op-kernel-dev-3a9f5bd82dc986d496d8484ff54b107b4515f43f.zip op-kernel-dev-3a9f5bd82dc986d496d8484ff54b107b4515f43f.tar.gz | |
USB: musb: Refer to musb_otg_timer_func under correct #ifdef
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 554a414..642a4e2 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -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 |
