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
/
isdn
/
hysdn
/
boardergo.c
diff --git
a/drivers/isdn/hysdn/boardergo.c
b/drivers/isdn/hysdn/boardergo.c
index
48d134b
..
73afebd
100644
(file)
--- a/
drivers/isdn/hysdn/boardergo.c
+++ b/
drivers/isdn/hysdn/boardergo.c
@@
-14,7
+14,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/signal.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/signal.h>
#include <linux/kernel.h>
@@
-436,7
+435,7
@@
ergo_inithardware(hysdn_card * card)
}
ergo_stopcard(card); /* disable interrupts */
}
ergo_stopcard(card); /* disable interrupts */
- if (request_irq(card->irq, ergo_interrupt,
SA_SHIRQ
, "HYSDN", card)) {
+ if (request_irq(card->irq, ergo_interrupt,
IRQF_SHARED
, "HYSDN", card)) {
ergo_releasehardware(card); /* return the acquired hardware */
return (-1);
}
ergo_releasehardware(card); /* return the acquired hardware */
return (-1);
}