git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "libipw: initiate cfg80211 API conversion"
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ipw2x00
/
ipw2100.c
diff --git
a/drivers/net/wireless/ipw2x00/ipw2100.c
b/drivers/net/wireless/ipw2x00/ipw2100.c
index
240cff1
..
6e2fc0c
100644
(file)
--- 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;
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);
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);
sysfs_remove_group(&pci_dev->dev.kobj,
&ipw2100_attribute_group);
- free_ieee80211(dev
, 0
);
+ free_ieee80211(dev);
pci_set_drvdata(pci_dev, NULL);
}
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);
if (dev->base_addr)
iounmap((void __iomem *)dev->base_addr);
- free_ieee80211(dev
, 0
);
+ free_ieee80211(dev);
}
pci_release_regions(pci_dev);
}
pci_release_regions(pci_dev);