summaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-19 17:52:23 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-19 17:52:23 +0000
commit5b5e6922c6118357b2305be4c718539c5c5c3d2c (patch)
tree017fb27939d1ae08b42bcc843f5b9172e399a9c3 /target/linux/ramips
parent5e8b0f2f943d36233646df76f088030969493114 (diff)
ramips: merge 3.2 fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30652 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/files/drivers/usb/host/ehci-rt3883.c2
-rw-r--r--target/linux/ramips/patches-3.2/301-rt3883-ehci-3.2-fix.patch11
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 d22bd73b9..a64cac7f3 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 e2ba05dff..000000000
--- 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");
-