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
/
prism54
/
islpci_hotplug.c
diff --git
a/drivers/net/wireless/prism54/islpci_hotplug.c
b/drivers/net/wireless/prism54/islpci_hotplug.c
index
bfa0cc3
..
09fc17a
100644
(file)
--- a/
drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/
drivers/net/wireless/prism54/islpci_hotplug.c
@@
-189,7
+189,7
@@
prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* request for the interrupt before uploading the firmware */
rvalue = request_irq(pdev->irq, &islpci_interrupt,
-
SA_SHIRQ
, ndev->name, priv);
+
IRQF_SHARED
, ndev->name, priv);
if (rvalue) {
/* error, could not hook the handler to the irq */