From fd7e252e40d78729383289b0592b0b84248704f4 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 12 Sep 2006 15:29:04 -0500
Subject: [PATCH] --- yaml --- r: 36527 b: refs/heads/master c:
 8aeb9fc5699f1b3c64ba152910f7c5c075c3a93a h: refs/heads/master i:   36525:
 eb281a81b255f14380355eb7e6c1d06577b8eeee   36523:
 b86a72ddead9917e4e131bd4dd32f21a590b54d2   36519:
 7e4518fba63bf77138b1cdc68ff92e491a5a18c9   36511:
 7c7f1a761ba5fc7514cf63cd62050477606d0b9a v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ad97efe0a6f1..cb326023c85e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2f206f4a711b0b1e6d3cdca52e919a986aceada
+refs/heads/master: 8aeb9fc5699f1b3c64ba152910f7c5c075c3a93a
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index cb9a3ae8463a..b02e50d2ca32 100644
--- a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2405,9 +2405,10 @@ static int bcm43xx_chip_init(struct bcm43xx_private *bcm)
 				   BCM43xx_UCODE_TIME) & 0x1f);
 
 	if ( value16 > 0x128 ) {
-		dprintk(KERN_ERR PFX
-			"Firmware: no support for microcode rev > 0x128\n");
-		err = -1;
+		printk(KERN_ERR PFX
+			"Firmware: no support for microcode extracted "
+			"from version 4.x binary drivers.\n");
+		err = -EOPNOTSUPP;
 		goto err_release_fw;
 	}