From fccf93dec3d67e30f66dc00f620cb7b8e9c623af Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Fri, 17 Feb 2006 08:25:12 +0800
Subject: [PATCH] --- yaml --- r: 21303 b: refs/heads/master c:
 e8c69e27d14a5fb15df9967f8c8ec5978af33ba8 h: refs/heads/master i:   21301:
 b8fab67f2d9390300ce9f64eb50d4074f5e8287d   21299:
 034558ca56cdbec752b8839fb632ab0d09e2d656   21295:
 07510c7197e9b0e0cd529e57f8567dbc35808bbb v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/wireless/ipw2200.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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");