aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-07-10 12:17:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-07-10 12:17:41 +0000
commit8f413218ba8748a10a1479bbf1355c25967250ac (patch)
treeef2ea67b5cab6c142ca8e882005c105d57058e94 /target
parent8e1f2ebdadfe688f31e3a47e8759d1ea151c67ed (diff)
downloadupstream-8f413218ba8748a10a1479bbf1355c25967250ac.tar.gz
upstream-8f413218ba8748a10a1479bbf1355c25967250ac.tar.bz2
upstream-8f413218ba8748a10a1479bbf1355c25967250ac.zip
brcm47xx: fix a small copy&paste error in the b44 fix for 2.6.34 and 2.6.35
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22116 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch5
-rw-r--r--target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch5
2 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
index d5ade16c70..8e1615f770 100644
--- a/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
@@ -1,11 +1,10 @@
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
-@@ -190,11 +190,12 @@ static int b44_wait_bit(struct b44 *bp,
- break;
+@@ -191,10 +190,11 @@ static int b44_wait_bit(struct b44 *bp,
udelay(10);
}
-+#if 0
if (i == timeout) {
++#if 0
if (net_ratelimit())
netdev_err(bp->dev, "BUG! Timeout waiting for bit %08x of register %lx to %s\n",
bit, reg, clear ? "clear" : "set");
diff --git a/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch
index d5ade16c70..925197bc83 100644
--- a/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch
+++ b/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch
@@ -1,11 +1,10 @@
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
-@@ -190,11 +190,12 @@ static int b44_wait_bit(struct b44 *bp,
- break;
+@@ -191,10 +191,11 @@ static int b44_wait_bit(struct b44 *bp,
udelay(10);
}
-+#if 0
if (i == timeout) {
++#if 0
if (net_ratelimit())
netdev_err(bp->dev, "BUG! Timeout waiting for bit %08x of register %lx to %s\n",
bit, reg, clear ? "clear" : "set");