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
/
char
/
ftape
/
lowlevel
/
fdc-io.c
diff --git
a/drivers/char/ftape/lowlevel/fdc-io.c
b/drivers/char/ftape/lowlevel/fdc-io.c
index
093fdf9
..
2165324
100644
(file)
--- a/
drivers/char/ftape/lowlevel/fdc-io.c
+++ b/
drivers/char/ftape/lowlevel/fdc-io.c
@@
-26,7
+26,6
@@
* Linux.
*/
* Linux.
*/
-#include <linux/config.h> /* for CONFIG_FT_* */
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/ioport.h>
@@
-1268,7
+1267,7
@@
static int fdc_grab_irq_and_dma(void)
/* Get fast interrupt handler.
*/
if (request_irq(fdc.irq, ftape_interrupt,
/* Get fast interrupt handler.
*/
if (request_irq(fdc.irq, ftape_interrupt,
-
SA_INTERRUPT
, "ft", ftape_id)) {
+
IRQF_DISABLED
, "ft", ftape_id)) {
TRACE_ABORT(-EIO, ft_t_bug,
"Unable to grab IRQ%d for ftape driver",
fdc.irq);
TRACE_ABORT(-EIO, ft_t_bug,
"Unable to grab IRQ%d for ftape driver",
fdc.irq);