generic: merge mips multi machine update to generic patches for 2.6.33

[openwrt.git] / target / linux / ar71xx / patches-2.6.33 / 003-ar71xx_usb_host.patch

diff --git a/target/linux/ar71xx/patches-2.6.33/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.33/003-ar71xx_usb_host.patch
index 0a428c7..238a79c 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.33/003-ar71xx_usb_host.patch
+++ b/target/linux/ar71xx/patches-2.6.33/003-ar71xx_usb_host.patch
@@ -1,8 +1,8 @@
 --- a/drivers/usb/host/Kconfig
 +++ b/drivers/usb/host/Kconfig
-@@ -98,6 +98,13 @@ config USB_EHCI_BIG_ENDIAN_DESC
-       depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
-       default y
+@@ -109,6 +109,13 @@ config XPS_USB_HCD_XILINX
+               support both high speed and full speed devices, or high speed
+               devices only.
  
 +config USB_EHCI_AR71XX
 +      bool "USB EHCI support for AR71xx"
@@ -14,7 +14,7 @@
  config USB_EHCI_FSL
        bool "Support for Freescale on-chip EHCI USB controller"
        depends on USB_EHCI_HCD && FSL_SOC
-@@ -189,6 +196,13 @@ config USB_OHCI_HCD
+@@ -207,6 +214,13 @@ config USB_OHCI_HCD
          To compile this driver as a module, choose M here: the
          module will be called ohci-hcd.
  
@@ -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
-@@ -1141,6 +1141,11 @@ MODULE_LICENSE ("GPL");
+@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL");
  #define       PLATFORM_DRIVER         ehci_atmel_driver
  #endif