mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
This commit is contained in:
commit
9bfe99a8f9
35 changed files with 1097 additions and 199 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue