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
/
serial
/
icom.c
diff --git
a/drivers/serial/icom.c
b/drivers/serial/icom.c
index
144a7a3
..
a3c00a2
100644
(file)
--- a/
drivers/serial/icom.c
+++ b/
drivers/serial/icom.c
@@
-24,7
+24,6
@@
*/
#define SERIAL_DO_RESTART
#include <linux/module.h>
*/
#define SERIAL_DO_RESTART
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/signal.h>
@@
-1564,7
+1563,7
@@
static int __devinit icom_probe(struct pci_dev *dev,
/* save off irq and request irq line */
if ( (retval = request_irq(dev->irq, icom_interrupt,
/* save off irq and request irq line */
if ( (retval = request_irq(dev->irq, icom_interrupt,
-
SA_INTERRUPT | SA_SHIRQ
, ICOM_DRIVER_NAME,
+
IRQF_DISABLED | IRQF_SHARED
, ICOM_DRIVER_NAME,
(void *) icom_adapter))) {
goto probe_exit2;
}
(void *) icom_adapter))) {
goto probe_exit2;
}