summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-20 23:43:18 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-20 23:43:18 +0100
commit9bfe99a8f95122f83f3c894b1071b61e2b6d4990 (patch)
treee322752b04deb314b579cae2c5c9993453775823 /drivers/usb
parentf72caf7e496465182eeda842ac66a5e75404ddf1 (diff)
parent54c1f6367c2836a85e821a010085ed04ab2235bc (diff)
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-mxc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index ead59f42e69b..544ccfd7056e 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -199,8 +199,8 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
writel(pdata->portsc, hcd->regs + PORTSC_OFFSET);
mdelay(10);
- /* setup USBCONTROL. */
- ret = mxc_set_usbcontrol(pdev->id, pdata->flags);
+ /* setup specific usb hw */
+ ret = mxc_initialize_usb_hw(pdev->id, pdata->flags);
if (ret < 0)
goto err_init;