aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.12/102-ehci_hcd_ignore_oc.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-02-13 12:57:36 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-02-13 12:57:36 +0000
commit87573f9583f900bc82fe435ebbcff8dd72c88205 (patch)
tree2f9a80173d0873fc7198b0ed4138f4d734555c97 /target/linux/generic/patches-3.12/102-ehci_hcd_ignore_oc.patch
parent23122cc26eed5dca0dde4814551da2c9395979c4 (diff)
downloadupstream-87573f9583f900bc82fe435ebbcff8dd72c88205.tar.gz
upstream-87573f9583f900bc82fe435ebbcff8dd72c88205.tar.bz2
upstream-87573f9583f900bc82fe435ebbcff8dd72c88205.zip
[generic]: upgrade 3.12 to 3.12.10
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39581 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.12/102-ehci_hcd_ignore_oc.patch')
-rw-r--r--target/linux/generic/patches-3.12/102-ehci_hcd_ignore_oc.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.12/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.12/102-ehci_hcd_ignore_oc.patch
index 4ad049809e..de1765288b 100644
--- a/target/linux/generic/patches-3.12/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-3.12/102-ehci_hcd_ignore_oc.patch
@@ -61,10 +61,10 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
retval = pdata->pre_setup(hcd);
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
-@@ -203,6 +203,7 @@ struct ehci_hcd { /* one per controlle
- unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
+@@ -204,6 +204,7 @@ struct ehci_hcd { /* one per controlle
unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */
unsigned need_oc_pp_cycle:1; /* MPC834X port power */
+ unsigned imx28_write_fix:1; /* For Freescale i.MX28 */
+ unsigned ignore_oc:1;
/* required for usb32 quirk */