projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[powerpc.git]
/
drivers
/
net
/
tokenring
/
abyss.c
diff --git
a/drivers/net/tokenring/abyss.c
b/drivers/net/tokenring/abyss.c
index
649d8ea
..
1bdd3be
100644
(file)
--- a/
drivers/net/tokenring/abyss.c
+++ b/
drivers/net/tokenring/abyss.c
@@
-123,7
+123,7
@@
static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
goto err_out_trdev;
}
- ret = request_irq(pdev->irq, tms380tr_interrupt,
SA_SHIRQ
,
+ ret = request_irq(pdev->irq, tms380tr_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (ret)
goto err_out_region;