ramips: merge 3.2 fixes
SVN-Revision: 30652
This commit is contained in:
parent
18fdaee00b
commit
62f213eab9
2 changed files with 1 additions and 12 deletions
|
@ -21,7 +21,7 @@ static int ehci_rt3883_init(struct usb_hcd *hcd)
|
||||||
|
|
||||||
ehci->caps = hcd->regs;
|
ehci->caps = hcd->regs;
|
||||||
ehci->regs = hcd->regs +
|
ehci->regs = hcd->regs +
|
||||||
HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
|
HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
|
||||||
dbg_hcs_params(ehci, "reset");
|
dbg_hcs_params(ehci, "reset");
|
||||||
dbg_hcc_params(ehci, "reset");
|
dbg_hcc_params(ehci, "reset");
|
||||||
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/drivers/usb/host/ehci-rt3883.c
|
|
||||||
+++ b/drivers/usb/host/ehci-rt3883.c
|
|
||||||
@@ -21,7 +21,7 @@ static int ehci_rt3883_init(struct usb_h
|
|
||||||
|
|
||||||
ehci->caps = hcd->regs;
|
|
||||||
ehci->regs = hcd->regs +
|
|
||||||
- HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
|
|
||||||
+ HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
|
|
||||||
dbg_hcs_params(ehci, "reset");
|
|
||||||
dbg_hcc_params(ehci, "reset");
|
|
||||||
|
|
Loading…
Reference in a new issue