diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-20 23:43:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-20 23:43:18 +0100 |
| commit | 9bfe99a8f95122f83f3c894b1071b61e2b6d4990 (patch) | |
| tree | e322752b04deb314b579cae2c5c9993453775823 /drivers/usb | |
| parent | Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | mx31_3ds: Support the keypad situated in the personality board (diff) | |
| download | linux-dev-9bfe99a8f95122f83f3c894b1071b61e2b6d4990.tar.xz linux-dev-9bfe99a8f95122f83f3c894b1071b61e2b6d4990.zip | |
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.c | 4 |
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; |