ramips: merge 3.2 fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30652 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 d22bd73..a64cac7 100644 (file)
--- 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 (file)
index e2ba05d..0000000
--- 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");
-