diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
| commit | 3afdb0f3528991de0833224f2dba60dc061e01fa (patch) | |
| tree | 0d9c7529c6cc2b41f0df778cc396edd74699721a /drivers/usb/host | |
| parent | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (diff) | |
| parent | f7fdaca910e6bc13659ecdffc28c97938b752e01 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ehci-mxc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index c8e360d7d975..25c8c10bb689 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c | |||
| @@ -203,11 +203,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) | |||
| 203 | mdelay(10); | 203 | mdelay(10); |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | /* setup specific usb hw */ | ||
| 207 | ret = mxc_initialize_usb_hw(pdev->id, pdata->flags); | ||
| 208 | if (ret < 0) | ||
| 209 | goto err_init; | ||
| 210 | |||
| 211 | ehci = hcd_to_ehci(hcd); | 206 | ehci = hcd_to_ehci(hcd); |
| 212 | 207 | ||
| 213 | /* EHCI registers start at offset 0x100 */ | 208 | /* EHCI registers start at offset 0x100 */ |