Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-block.git] / drivers / net / wireless / ipw2x00 / ipw2200.c

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index f37d315f942f7a9e93a099678f6bfeb5fb325f3a..d57522c64073463763d619edc6162a381d27f668 100644 (file)
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -7024,7 +7024,7 @@ static int ipw_qos_activate(struct ipw_priv *priv,
                            cpu_to_le16(burst_duration);
        } else if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
                if (type == IEEE_B) {
-                       IPW_DEBUG_QOS("QoS activate IBSS nework mode %d\n",
+                       IPW_DEBUG_QOS("QoS activate IBSS network mode %d\n",
                                      type);
                        if (priv->qos_data.qos_enable == 0)
                                active_one = &def_parameters_CCK;
@@ -11829,10 +11829,6 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
        net_dev->wireless_data = &priv->wireless_data;
        net_dev->wireless_handlers = &ipw_wx_handler_def;
        net_dev->ethtool_ops = &ipw_ethtool_ops;
-       net_dev->irq = pdev->irq;
-       net_dev->base_addr = (unsigned long)priv->hw_base;
-       net_dev->mem_start = pci_resource_start(pdev, 0);
-       net_dev->mem_end = net_dev->mem_start + pci_resource_len(pdev, 0) - 1;
 
        err = sysfs_create_group(&pdev->dev.kobj, &ipw_attribute_group);
        if (err) {