diff options
author | Matt Mackall <mpm@selenic.com> | 2006-06-25 08:47:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:01:00 -0400 |
commit | afedfd016a78ea1b678886ab6236acbc7650fcfb (patch) | |
tree | e507606f1f636d5557ca91305b2891070d75b3f1 /include/asm-alpha | |
parent | 51849738cf3af4d2c43a657e811a89e7f69eccc2 (diff) |
[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-alpha')
-rw-r--r-- | include/asm-alpha/floppy.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-alpha/floppy.h b/include/asm-alpha/floppy.h index e177d4180f83..21816d35ef89 100644 --- a/include/asm-alpha/floppy.h +++ b/include/asm-alpha/floppy.h | |||
@@ -25,9 +25,8 @@ | |||
25 | #define fd_enable_irq() enable_irq(FLOPPY_IRQ) | 25 | #define fd_enable_irq() enable_irq(FLOPPY_IRQ) |
26 | #define fd_disable_irq() disable_irq(FLOPPY_IRQ) | 26 | #define fd_disable_irq() disable_irq(FLOPPY_IRQ) |
27 | #define fd_cacheflush(addr,size) /* nothing */ | 27 | #define fd_cacheflush(addr,size) /* nothing */ |
28 | #define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \ | 28 | #define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt,\ |
29 | SA_INTERRUPT|SA_SAMPLE_RANDOM, \ | 29 | SA_INTERRUPT, "floppy", NULL) |
30 | "floppy", NULL) | ||
31 | #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL); | 30 | #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL); |
32 | 31 | ||
33 | #ifdef CONFIG_PCI | 32 | #ifdef CONFIG_PCI |