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]
/
include
/
asm-mips
/
mach-generic
/
floppy.h
diff --git
a/include/asm-mips/mach-generic/floppy.h
b/include/asm-mips/mach-generic/floppy.h
index
d476013
..
001a8ce
100644
(file)
--- a/
include/asm-mips/mach-generic/floppy.h
+++ b/
include/asm-mips/mach-generic/floppy.h
@@
-12,7
+12,6
@@
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/sched.h>
-#include <linux/kernel.h>
#include <linux/linkage.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/linkage.h>
#include <linux/types.h>
#include <linux/mm.h>
@@
-99,7
+98,7
@@
static inline void fd_disable_irq(void)
static inline int fd_request_irq(void)
{
return request_irq(FLOPPY_IRQ, floppy_interrupt,
static inline int fd_request_irq(void)
{
return request_irq(FLOPPY_IRQ, floppy_interrupt,
-
SA_INTERRUPT | SA_SAMPLE_RANDOM
, "floppy", NULL);
+
IRQF_DISABLED
, "floppy", NULL);
}
static inline void fd_free_irq(void)
}
static inline void fd_free_irq(void)