projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
net
/
wireless
/
orinoco_pci.h
diff --git
a/drivers/net/wireless/orinoco_pci.h
b/drivers/net/wireless/orinoco_pci.h
index
7eb1e08
..
be1abea
100644
(file)
--- a/
drivers/net/wireless/orinoco_pci.h
+++ b/
drivers/net/wireless/orinoco_pci.h
@@
-63,7
+63,7
@@
static int orinoco_pci_resume(struct pci_dev *pdev)
pci_enable_device(pdev);
pci_restore_state(pdev);
pci_enable_device(pdev);
pci_restore_state(pdev);
- err = request_irq(pdev->irq, orinoco_interrupt,
SA_SHIRQ
,
+ err = request_irq(pdev->irq, orinoco_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (err) {
printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",
dev->name, dev);
if (err) {
printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",