From 052bce82f8db0bc3b40cf8d1541f4f524893fd85 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Tue, 24 Jan 2006 16:36:22 +0800
Subject: [PATCH] --- yaml --- r: 19071 b: refs/heads/master c:
 f73cb83f1ace1a4bd3c57ae33f5c6c8bac9c0946 h: refs/heads/master i:   19069:
 dd9c0e86c8092b2fddab152bf389ca0beff9efd7   19067:
 4e0e61511d698f4783370465077ab6f578339097   19063:
 62c5d74ed543df1a54cd7404de3c965f43d53a05   19055:
 e2dc61eb65cbc8f322507b842bb6b0d967e9486b   19039:
 f139fd53579f98d02416a82664f779825eba61a9   19007:
 6fe9667cca978553f39a8e276d11c3e4d9949957   18943:
 11a33311a474987c09b9a616bf2d4afde83d697e v: v3

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

diff --git a/[refs] b/[refs]
index c1553bc5c956..f1c4ad525642 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6e4da72342cb075a2742c79e693c8edc1d55389
+refs/heads/master: f73cb83f1ace1a4bd3c57ae33f5c6c8bac9c0946
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index 4c28e332ecc3..877fdaf43ffa 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/drivers/net/wireless/ipw2200.c
@@ -11035,7 +11035,6 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	net_dev->set_multicast_list = ipw_net_set_multicast_list;
 	net_dev->set_mac_address = ipw_net_set_mac_address;
 	priv->wireless_data.spy_data = &priv->ieee->spy_data;
-	priv->wireless_data.ieee80211 = priv->ieee;
 	net_dev->wireless_data = &priv->wireless_data;
 	net_dev->wireless_handlers = &ipw_wx_handler_def;
 	net_dev->ethtool_ops = &ipw_ethtool_ops;