aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sh
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-sh
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-sh')
-rw-r--r--include/asm-sh/floppy.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h
index 38d7a2942476..307d9ce9f9ed 100644
--- a/include/asm-sh/floppy.h
+++ b/include/asm-sh/floppy.h
@@ -147,11 +147,10 @@ static int fd_request_irq(void)
147{ 147{
148 if(can_use_virtual_dma) 148 if(can_use_virtual_dma)
149 return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, 149 return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
150 "floppy", NULL); 150 "floppy", NULL);
151 else 151 else
152 return request_irq(FLOPPY_IRQ, floppy_interrupt, 152 return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,
153 SA_INTERRUPT|SA_SAMPLE_RANDOM, 153 "floppy", NULL);
154 "floppy", NULL);
155 154
156} 155}
157 156