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-ppc | |
| parent | 51849738cf3af4d2c43a657e811a89e7f69eccc2 (diff) | |
| download | linux-stable-afedfd016a78ea1b678886ab6236acbc7650fcfb.tar.gz linux-stable-afedfd016a78ea1b678886ab6236acbc7650fcfb.tar.bz2 linux-stable-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-ppc')
| -rw-r--r-- | include/asm-ppc/floppy.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h index 8ccd4a276fe9..2ba191eba448 100644 --- a/include/asm-ppc/floppy.h +++ b/include/asm-ppc/floppy.h @@ -99,10 +99,8 @@ static int fd_request_irq(void) return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, "floppy", NULL); else - return request_irq(FLOPPY_IRQ, floppy_interrupt, - SA_INTERRUPT|SA_SAMPLE_RANDOM, - "floppy", NULL); - + return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, + "floppy", NULL); } static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) |