From: Jonas Gorski <jogo@openwrt.org>
Date: Sat, 10 Nov 2012 22:10:47 +0000 (+0000)
Subject: bcm63xx: fix compilation with kmod-ohci enabled with 3.6
X-Git-Tag: reboot~12358
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c54fa281b1c7977f9e2d5dee5b163fe7d536bcf4;p=oweals%2Fopenwrt.git

bcm63xx: fix compilation with kmod-ohci enabled with 3.6

Fixes the following error:

drivers/usb/host/ohci-bcm63xx.c: In function 'ohci_bcm63xx_start':
drivers/usb/host/ohci-bcm63xx.c:33:3: error: implicit declaration of function 'err' [-Werror=implicit-function-declaration]

Reported-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 34138
---

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 23f0a573db..bffca3c83f 100644
--- 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;
 +	}