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-parisc | |
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-parisc')
-rw-r--r-- | include/asm-parisc/floppy.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-parisc/floppy.h b/include/asm-parisc/floppy.h index ca3aed768cdc..458cdb2a7530 100644 --- a/include/asm-parisc/floppy.h +++ b/include/asm-parisc/floppy.h | |||
@@ -159,10 +159,8 @@ static int fd_request_irq(void) | |||
159 | return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, | 159 | return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, |
160 | "floppy", NULL); | 160 | "floppy", NULL); |
161 | else | 161 | else |
162 | return request_irq(FLOPPY_IRQ, floppy_interrupt, | 162 | return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, |
163 | SA_INTERRUPT|SA_SAMPLE_RANDOM, | 163 | "floppy", NULL); |
164 | "floppy", NULL); | ||
165 | |||
166 | } | 164 | } |
167 | 165 | ||
168 | static unsigned long dma_mem_alloc(unsigned long size) | 166 | static unsigned long dma_mem_alloc(unsigned long size) |