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
linux 2.6.16.38 w/ vs2.0.3-rc1
[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
244f63b
..
b1b66e7
100644
(file)
--- a/
drivers/serial/jsm/jsm_driver.c
+++ b/
drivers/serial/jsm/jsm_driver.c
@@
-20,7
+20,7
@@
*
* Contact Information:
* Scott H Kilau <Scott_Kilau@digi.com>
*
* Contact Information:
* Scott H Kilau <Scott_Kilau@digi.com>
- * Wendy Xiong <wendyx@us.ibm.com>
+ * Wendy Xiong <wendyx@us.
ltcfwd.linux.
ibm.com>
*
*
***********************************************************************/
*
*
***********************************************************************/
@@
-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,
}
rc = request_irq(brd->irq, brd->bd_ops->intr,
-
IRQF_DISABLED|IRQF_SHARED
, "JSM", brd);
+
SA_INTERRUPT|SA_SHIRQ
, "JSM", brd);
if (rc) {
printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq);
goto out_iounmap;
if (rc) {
printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq);
goto out_iounmap;