summaryrefslogtreecommitdiff
path: root/drivers/usb/musb/davinci.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-03-22 16:05:45 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-03-22 16:05:45 +1100
commit73acd93e00518b61288cee58729b5e5edcc847f7 (patch)
treee196a4bf8de391b8b0039b94fed0b16d28070bdf /drivers/usb/musb/davinci.c
parent854cef11e9487f1a82a66804b00a673ee6d57fe3 (diff)
parentf8c027a27412ddcbf8c754e80b71061eb894c0b8 (diff)
Merge branch 'quilt/usb'
Diffstat (limited to 'drivers/usb/musb/davinci.c')
-rw-r--r--drivers/usb/musb/davinci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index a883f9dd3f8a..d37abf39394a 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -377,7 +377,7 @@ int musb_platform_set_mode(struct musb *musb, u8 mode)
return -EIO;
}
-int __init musb_platform_init(struct musb *musb)
+int __init musb_platform_init(struct musb *musb, void *board_data)
{
void __iomem *tibase = musb->ctrl_base;
u32 revision;