diff --git a/[refs] b/[refs]
index 19ce39f98337..4b7afaec159e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6d5b5c13e5003c9d33dcdcfdf1febc6efd7d319
+refs/heads/master: e8c69e27d14a5fb15df9967f8c8ec5978af33ba8
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index b80ebd37483e..e9804450ca6c 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/drivers/net/wireless/ipw2200.c
@@ -8064,7 +8064,7 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)
 
 	if ((priv->pci_dev->device == 0x4223) ||
 	    (priv->pci_dev->device == 0x4224)) {
-		if (option == 2)
+		if (option == 1)
 			printk(KERN_INFO DRV_NAME
 			       ": Detected Intel PRO/Wireless 2915ABG Network "
 			       "Connection\n");
@@ -8075,7 +8075,7 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)
 		priv->adapter = IPW_2915ABG;
 		priv->ieee->mode = IEEE_A | IEEE_G | IEEE_B;
 	} else {
-		if (option == 2)
+		if (option == 1)
 			printk(KERN_INFO DRV_NAME
 			       ": Detected Intel PRO/Wireless 2200BG Network "
 			       "Connection\n");