resync 2.6.31 patches

[openwrt.git] / target / linux / brcm47xx / patches-2.6.30 / 270-ehci-ssb.patch

diff --git a/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch
index e64dc4b..d142133 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch
+++ b/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch
@@ -5,8 +5,8 @@
  drivers/usb/host/ohci-ssb.c |   23 +++++
  4 files changed, 247 insertions(+), 2 deletions(-)
 
---- linux-2.6.30.5.orig/drivers/usb/host/Kconfig
-+++ linux-2.6.30.5/drivers/usb/host/Kconfig
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
 @@ -106,6 +106,19 @@ config USB_OXU210HP_HCD
          To compile this driver as a module, choose M here: the
          module will be called oxu210hp-hcd.
@@ -27,9 +27,9 @@
  config USB_ISP116X_HCD
        tristate "ISP116X HCD support"
        depends on USB
---- linux-2.6.30.5.orig/drivers/usb/host/ehci-hcd.c
-+++ linux-2.6.30.5/drivers/usb/host/ehci-hcd.c
-@@ -1072,8 +1072,16 @@ MODULE_LICENSE ("GPL");
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -1075,8 +1075,16 @@ MODULE_LICENSE ("GPL");
  #define       PLATFORM_DRIVER         ixp4xx_ehci_driver
  #endif
  
@@ -49,7 +49,7 @@
  #endif
  
 --- /dev/null
-+++ linux-2.6.30.5/drivers/usb/host/ehci-ssb.c
++++ b/drivers/usb/host/ehci-ssb.c
 @@ -0,0 +1,201 @@
 +/*
 + * Sonics Silicon Backplane
@@ -214,7 +214,7 @@
 +      u32 tmp, flags = 0;
 +
 +      hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
-+              dev->dev->bus_id);
++                           dev_name(dev->dev));
 +      if (!hcd)
 +              goto err_dev_disable;
 +
@@ -252,8 +252,8 @@
 +      SSB_DEVTABLE_END
 +};
 +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
---- linux-2.6.30.5.orig/drivers/usb/host/ohci-ssb.c
-+++ linux-2.6.30.5/drivers/usb/host/ohci-ssb.c
+--- a/drivers/usb/host/ohci-ssb.c
++++ b/drivers/usb/host/ohci-ssb.c
 @@ -17,6 +17,8 @@
   */
  #include <linux/ssb/ssb.h>