aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/floppy.h
diff options
context:
space:
mode:
authorMatt Mackall <mpm@selenic.com>2006-06-25 08:47:11 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:01:00 -0400
commitafedfd016a78ea1b678886ab6236acbc7650fcfb (patch)
treee507606f1f636d5557ca91305b2891070d75b3f1 /include/asm-x86_64/floppy.h
parent51849738cf3af4d2c43a657e811a89e7f69eccc2 (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-x86_64/floppy.h')
-rw-r--r--include/asm-x86_64/floppy.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-x86_64/floppy.h b/include/asm-x86_64/floppy.h
index 52825ce689f2..006291e89b4a 100644
--- a/include/asm-x86_64/floppy.h
+++ b/include/asm-x86_64/floppy.h
@@ -147,10 +147,8 @@ static int fd_request_irq(void)
147 return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, 147 return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
148 "floppy", NULL); 148 "floppy", NULL);
149 else 149 else
150 return request_irq(FLOPPY_IRQ, floppy_interrupt, 150 return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,
151 SA_INTERRUPT|SA_SAMPLE_RANDOM, 151 "floppy", NULL);
152 "floppy", NULL);
153
154} 152}
155 153
156static unsigned long dma_mem_alloc(unsigned long size) 154static unsigned long dma_mem_alloc(unsigned long size)