diff options
| author | Matt Mackall <mpm@selenic.com> | 2006-06-25 05:47:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:01:00 -0700 |
| commit | afedfd016a78ea1b678886ab6236acbc7650fcfb (patch) | |
| tree | e507606f1f636d5557ca91305b2891070d75b3f1 /include/asm-mips | |
| parent | 51849738cf3af4d2c43a657e811a89e7f69eccc2 (diff) | |
| download | linux-afedfd016a78ea1b678886ab6236acbc7650fcfb.tar.gz linux-afedfd016a78ea1b678886ab6236acbc7650fcfb.tar.bz2 linux-afedfd016a78ea1b678886ab6236acbc7650fcfb.zip | |
[PATCH] random: remove SA_SAMPLE_RANDOM from floppy driver
The floppy driver is already calling add_disk_randomness as it should, so this
was redundant.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/mach-generic/floppy.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/mach-jazz/floppy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/mach-generic/floppy.h b/include/asm-mips/mach-generic/floppy.h index 682a5858f8d7..83cd69e30ec3 100644 --- a/include/asm-mips/mach-generic/floppy.h +++ b/include/asm-mips/mach-generic/floppy.h @@ -98,7 +98,7 @@ static inline void fd_disable_irq(void) static inline int fd_request_irq(void) { return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT | SA_SAMPLE_RANDOM, "floppy", NULL); + SA_INTERRUPT, "floppy", NULL); } static inline void fd_free_irq(void) diff --git a/include/asm-mips/mach-jazz/floppy.h b/include/asm-mips/mach-jazz/floppy.h index c9dad99b1232..9413117915f4 100644 --- a/include/asm-mips/mach-jazz/floppy.h +++ b/include/asm-mips/mach-jazz/floppy.h @@ -90,7 +90,7 @@ static inline void fd_disable_irq(void) static inline int fd_request_irq(void) { return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT | SA_SAMPLE_RANDOM, "floppy", NULL); + SA_INTERRUPT, "floppy", NULL); } static inline void fd_free_irq(void) |