bcm63xx: refresh 3.6 patches

[librecmc/librecmc.git] / target / linux / brcm63xx / patches-3.6 / 400-ohci-add-driver-for-bcm63xx-integrated-controller.patch

diff --git a/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch b/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch
index 23f0a573db2f4ab37aebfb147fbbb1ae25e17141..572419cb684cbae079c81bf8ce32909b65f19fca 100644 (file)
--- a/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch
+++ b/target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch
@@ -31,7 +31,7 @@ Subject: [PATCH 23/63] ohci: add driver for bcm63xx integrated controller.
        depends on USB_OHCI_HCD && ARCH_OMAP1
 --- /dev/null
 +++ b/drivers/usb/host/ohci-bcm63xx.c
-@@ -0,0 +1,175 @@
+@@ -0,0 +1,176 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -64,7 +64,8 @@ Subject: [PATCH 23/63] ohci: add driver for bcm63xx integrated controller.
 +
 +      ret = ohci_run(ohci);
 +      if (ret < 0) {
-+              err("can't start %s", hcd->self.bus_name);
++              dev_err(hcd->self.controller, "can't start %s\n",
++                      hcd->self.bus_name);
 +              ohci_stop(hcd);
 +              return ret;
 +      }
@@ -210,7 +211,7 @@ Subject: [PATCH 23/63] ohci: add driver for bcm63xx integrated controller.
 --- a/drivers/usb/host/ohci-hcd.c
 +++ b/drivers/usb/host/ohci-hcd.c
 @@ -1120,6 +1120,11 @@ MODULE_LICENSE ("GPL");
- #define PLATFORM_DRIVER               ohci_platform_driver
+ #define OHCI_PLATFORM_DRIVER          ohci_platform_driver
  #endif
  
 +#ifdef CONFIG_USB_OHCI_BCM63XX