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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
serial
/
jsm
/
jsm_driver.c
diff --git
a/drivers/serial/jsm/jsm_driver.c
b/drivers/serial/jsm/jsm_driver.c
index
b3e1f71
..
244f63b
100644
(file)
--- a/
drivers/serial/jsm/jsm_driver.c
+++ b/
drivers/serial/jsm/jsm_driver.c
@@
-121,7
+121,7
@@
static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
rc = request_irq(brd->irq, brd->bd_ops->intr,
-
SA_INTERRUPT|SA_SHIRQ
, "JSM", brd);
+
IRQF_DISABLED|IRQF_SHARED
, "JSM", brd);
if (rc) {
printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq);
goto out_iounmap;