From: Gabor Juhos Date: Fri, 11 Dec 2009 20:32:25 +0000 (+0000) Subject: ar71xx: fix build error with 2.6.31.7 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5e209e3852709780860a5b3a8fd9bc6147e6414d;p=openwrt%2Fstaging%2Fnbd.git ar71xx: fix build error with 2.6.31.7 SVN-Revision: 18756 --- 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 */