aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-12-11 20:32:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-12-11 20:32:25 +0000
commit5e209e3852709780860a5b3a8fd9bc6147e6414d (patch)
tree2a3234f3c963b5ac84d7700662d0765bbf006a3e
parent8956009fa698e6ddf678d68cb32db4a76acfb632 (diff)
downloadupstream-5e209e3852709780860a5b3a8fd9bc6147e6414d.tar.gz
upstream-5e209e3852709780860a5b3a8fd9bc6147e6414d.tar.bz2
upstream-5e209e3852709780860a5b3a8fd9bc6147e6414d.zip
ar71xx: fix build error with 2.6.31.7
SVN-Revision: 18756
-rw-r--r--target/linux/ar71xx/patches-2.6.31/003-ar71xx_usb_host.patch4
-rw-r--r--target/linux/ar71xx/patches-2.6.31/110-usb-ehci-add-war-for-synopsys-hc-bug.patch6
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ar71xx/patches-2.6.31/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.31/003-ar71xx_usb_host.patch
index c2f14b2afc..0294faf990 100644
--- a/target/linux/ar71xx/patches-2.6.31/003-ar71xx_usb_host.patch
+++ b/target/linux/ar71xx/patches-2.6.31/003-ar71xx_usb_host.patch
@@ -30,7 +30,7 @@
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1117,6 +1117,11 @@ MODULE_LICENSE ("GPL");
+@@ -1119,6 +1119,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ixp4xx_ehci_driver
#endif
@@ -44,7 +44,7 @@
#error "missing bus glue for ehci-hcd"
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
-@@ -1081,6 +1081,11 @@ MODULE_LICENSE ("GPL");
+@@ -1086,6 +1086,11 @@ MODULE_LICENSE ("GPL");
#define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver
#endif
diff --git a/target/linux/ar71xx/patches-2.6.31/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.31/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
index a614999653..2e607ab236 100644
--- a/target/linux/ar71xx/patches-2.6.31/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
+++ b/target/linux/ar71xx/patches-2.6.31/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
@@ -1,6 +1,6 @@
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
-@@ -1128,6 +1128,9 @@ static void end_unlink_async (struct ehc
+@@ -1140,6 +1140,9 @@ static void end_unlink_async (struct ehc
ehci->reclaim = NULL;
start_unlink_async (ehci, next);
}
@@ -12,10 +12,10 @@
/* makes sure the async qh will become idle */
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
-@@ -126,6 +126,7 @@ struct ehci_hcd { /* one per controlle
- unsigned big_endian_mmio:1;
+@@ -128,6 +128,7 @@ struct ehci_hcd { /* one per controlle
unsigned big_endian_desc:1;
unsigned has_amcc_usb23:1;
+ unsigned broken_periodic:1;
+ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
/* required for usb32 quirk */