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
/
acorn
/
block
/
mfmhd.c
diff --git
a/drivers/acorn/block/mfmhd.c
b/drivers/acorn/block/mfmhd.c
index
ce074f6
..
3dd6b7b
100644
(file)
--- a/
drivers/acorn/block/mfmhd.c
+++ b/
drivers/acorn/block/mfmhd.c
@@
-99,7
+99,6
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/fs.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/fs.h>
#include <linux/interrupt.h>
@@
-1279,7
+1278,7
@@
static int mfm_do_init(unsigned char irqmask)
printk("mfm: detected %d hard drive%s\n", mfm_drives,
mfm_drives == 1 ? "" : "s");
printk("mfm: detected %d hard drive%s\n", mfm_drives,
mfm_drives == 1 ? "" : "s");
- ret = request_irq(mfm_irq, mfm_interrupt_handler,
SA_INTERRUPT
, "MFM harddisk", NULL);
+ ret = request_irq(mfm_irq, mfm_interrupt_handler,
IRQF_DISABLED
, "MFM harddisk", NULL);
if (ret) {
printk("mfm: unable to get IRQ%d\n", mfm_irq);
goto out4;
if (ret) {
printk("mfm: unable to get IRQ%d\n", mfm_irq);
goto out4;