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-powerpc | |
| 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-powerpc')
| -rw-r--r-- | include/asm-powerpc/floppy.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-powerpc/floppy.h b/include/asm-powerpc/floppy.h index 7e2d169ee856..9c8d91bf5a0d 100644 --- a/include/asm-powerpc/floppy.h +++ b/include/asm-powerpc/floppy.h | |||
| @@ -27,8 +27,7 @@ | |||
| 27 | #define fd_disable_irq() disable_irq(FLOPPY_IRQ) | 27 | #define fd_disable_irq() disable_irq(FLOPPY_IRQ) |
| 28 | #define fd_cacheflush(addr,size) /* nothing */ | 28 | #define fd_cacheflush(addr,size) /* nothing */ |
| 29 | #define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \ | 29 | #define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \ |
| 30 | SA_INTERRUPT|SA_SAMPLE_RANDOM, \ | 30 | SA_INTERRUPT, "floppy", NULL) |
| 31 | "floppy", NULL) | ||
| 32 | #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL); | 31 | #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL); |
| 33 | 32 | ||
| 34 | #ifdef CONFIG_PCI | 33 | #ifdef CONFIG_PCI |