aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-11-10 22:10:47 +0000
committerJonas Gorski <jogo@openwrt.org>2012-11-10 22:10:47 +0000
commitc54fa281b1c7977f9e2d5dee5b163fe7d536bcf4 (patch)
treebdc0568e836d7c3a95ab5c1b4b6a4cdb720a451f /target/linux
parent15519bec9c9ea702d29cacb11cf27eda45189e66 (diff)
downloadupstream-c54fa281b1c7977f9e2d5dee5b163fe7d536bcf4.tar.gz
upstream-c54fa281b1c7977f9e2d5dee5b163fe7d536bcf4.tar.bz2
upstream-c54fa281b1c7977f9e2d5dee5b163fe7d536bcf4.zip
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
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/patches-3.6/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch5
1 files changed, 3 insertions, 2 deletions
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;
+ }