summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/floppy.h
diff options
context:
space:
mode:
authorMatt Mackall2006-06-25 14:47:11 +0200
committerLinus Torvalds2006-06-25 19:01:00 +0200
commitafedfd016a78ea1b678886ab6236acbc7650fcfb (patch)
treee507606f1f636d5557ca91305b2891070d75b3f1 /include/asm-powerpc/floppy.h
parent[PATCH] bloat-o-meter: gcc-4 fix (diff)
downloadkernel-qcow2-linux-afedfd016a78ea1b678886ab6236acbc7650fcfb.tar.gz
kernel-qcow2-linux-afedfd016a78ea1b678886ab6236acbc7650fcfb.tar.xz
kernel-qcow2-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-powerpc/floppy.h')
-rw-r--r--include/asm-powerpc/floppy.h3
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 @@
#define fd_disable_irq() disable_irq(FLOPPY_IRQ)
#define fd_cacheflush(addr,size) /* nothing */
#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \
- SA_INTERRUPT|SA_SAMPLE_RANDOM, \
- "floppy", NULL)
+ SA_INTERRUPT, "floppy", NULL)
#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL);
#ifdef CONFIG_PCI