diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 07:43:01 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 07:43:01 (GMT) |
| commit | 8494347eedd2facf474021c615d1d07c62e04afd (patch) | |
| tree | ceba54fc99271dc45c629b9a60e98022d9735a05 /drivers/net/wireless/ipw2x00/ipw2100.c | |
| parent | 91e9c07bd635353d1a278bdb38dbb56ac371bcb8 (diff) | |
| parent | 505c92470bda486be589729514d3ed5302fb0551 (diff) | |
| download | linux-fsl-qoriq-8494347eedd2facf474021c615d1d07c62e04afd.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 240cff1..6e2fc0c 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -6029,7 +6029,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev, struct ipw2100_priv *priv; struct net_device *dev; - dev = alloc_ieee80211(sizeof(struct ipw2100_priv), 0); + dev = alloc_ieee80211(sizeof(struct ipw2100_priv)); if (!dev) return NULL; priv = libipw_priv(dev); @@ -6342,7 +6342,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev, sysfs_remove_group(&pci_dev->dev.kobj, &ipw2100_attribute_group); - free_ieee80211(dev, 0); + free_ieee80211(dev); pci_set_drvdata(pci_dev, NULL); } @@ -6400,7 +6400,7 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev) if (dev->base_addr) iounmap((void __iomem *)dev->base_addr); - free_ieee80211(dev, 0); + free_ieee80211(dev); } pci_release_regions(pci_dev); |