git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
hostap
/
hostap_pci.c
diff --git
a/drivers/net/wireless/hostap/hostap_pci.c
b/drivers/net/wireless/hostap/hostap_pci.c
index
194f070
..
c2fa011
100644
(file)
--- a/
drivers/net/wireless/hostap/hostap_pci.c
+++ b/
drivers/net/wireless/hostap/hostap_pci.c
@@
-4,7
+4,6
@@
* driver patches from Reyk Floeter <reyk@vantronix.net> and
* Andy Warner <andyw@pobox.com> */
* driver patches from Reyk Floeter <reyk@vantronix.net> and
* Andy Warner <andyw@pobox.com> */
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/if.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/if.h>
@@
-338,7
+337,7
@@
static int prism2_pci_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, dev);
pci_set_drvdata(pdev, dev);
- if (request_irq(dev->irq, prism2_interrupt,
SA_SHIRQ
, dev->name,
+ if (request_irq(dev->irq, prism2_interrupt,
IRQF_SHARED
, dev->name,
dev)) {
printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
goto fail;
dev)) {
printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
goto fail;