diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-02-19 17:52:23 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-02-19 17:52:23 +0000 |
| commit | 62f213eab95ae4015948f7f3f9da122edf0e8d8f (patch) | |
| tree | f9d31f90ac4aec63737d7f264ad0ab075285e1b0 /target | |
| parent | 18fdaee00bf1ac508c515648da38c1ccd82e710e (diff) | |
| download | upstream-62f213eab95ae4015948f7f3f9da122edf0e8d8f.tar.gz upstream-62f213eab95ae4015948f7f3f9da122edf0e8d8f.tar.bz2 upstream-62f213eab95ae4015948f7f3f9da122edf0e8d8f.zip | |
ramips: merge 3.2 fixes
SVN-Revision: 30652
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ramips/files/drivers/usb/host/ehci-rt3883.c | 2 | ||||
| -rw-r--r-- | target/linux/ramips/patches-3.2/301-rt3883-ehci-3.2-fix.patch | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/target/linux/ramips/files/drivers/usb/host/ehci-rt3883.c b/target/linux/ramips/files/drivers/usb/host/ehci-rt3883.c index d22bd73b94..a64cac7f3e 100644 --- a/target/linux/ramips/files/drivers/usb/host/ehci-rt3883.c +++ b/target/linux/ramips/files/drivers/usb/host/ehci-rt3883.c @@ -21,7 +21,7 @@ static int ehci_rt3883_init(struct usb_hcd *hcd) 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"); diff --git a/target/linux/ramips/patches-3.2/301-rt3883-ehci-3.2-fix.patch b/target/linux/ramips/patches-3.2/301-rt3883-ehci-3.2-fix.patch deleted file mode 100644 index e2ba05dfff..0000000000 --- a/target/linux/ramips/patches-3.2/301-rt3883-ehci-3.2-fix.patch +++ /dev/null @@ -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"); - |