bcm47xx: Clean up USB patches

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

diff --git a/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch
index 68f7322ca5e698a75f518432be4af24320794744..3b5cfd5e616dde9319a84adeef4c9cc3bfdcfe35 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch
+++ b/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch
@@ -1,5 +1,12 @@
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
+---
+ drivers/usb/host/Kconfig    |   13 ++
+ drivers/usb/host/ehci-hcd.c |   12 ++
+ drivers/usb/host/ehci-ssb.c |  201 ++++++++++++++++++++++++++++++++++++++++++++
+ drivers/usb/host/ohci-ssb.c |   23 +++++
+ 4 files changed, 247 insertions(+), 2 deletions(-)
+
+--- linux-2.6.28.10.orig/drivers/usb/host/Kconfig
++++ linux-2.6.28.10/drivers/usb/host/Kconfig
 @@ -96,6 +96,19 @@ config USB_EHCI_HCD_PPC_OF
          Enables support for the USB controller present on the PowerPC
          OpenFirmware platform bus.
@@ -20,8 +27,8 @@
  config USB_ISP116X_HCD
        tristate "ISP116X HCD support"
        depends on USB
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
+--- linux-2.6.28.10.orig/drivers/usb/host/ehci-hcd.c
++++ linux-2.6.28.10/drivers/usb/host/ehci-hcd.c
 @@ -1036,8 +1036,16 @@ MODULE_LICENSE ("GPL");
  #define       PLATFORM_DRIVER         ixp4xx_ehci_driver
  #endif
@@ -42,7 +49,7 @@
  #endif
  
 --- /dev/null
-+++ b/drivers/usb/host/ehci-ssb.c
++++ linux-2.6.28.10/drivers/usb/host/ehci-ssb.c
 @@ -0,0 +1,201 @@
 +/*
 + * Sonics Silicon Backplane
@@ -245,8 +252,8 @@
 +      SSB_DEVTABLE_END
 +};
 +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
+--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c
++++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c
 @@ -17,6 +17,8 @@
   */
  #include <linux/ssb/ssb.h>
@@ -290,7 +297,7 @@
  static int ssb_ohci_attach(struct ssb_device *dev)
  {
        struct ssb_ohci_device *ohcidev;
-@@ -184,6 +199,14 @@ static int ssb_ohci_attach(struct ssb_de
+@@ -165,6 +180,14 @@ static int ssb_ohci_attach(struct ssb_de
  
        ssb_set_drvdata(dev, hcd);