Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / include / asm-x86_64 / floppy.h

diff --git a/include/asm-x86_64/floppy.h b/include/asm-x86_64/floppy.h
index af7ded6..52825ce 100644 (file)
--- a/include/asm-x86_64/floppy.h
+++ b/include/asm-x86_64/floppy.h
@@ -155,7 +155,7 @@ static int fd_request_irq(void)
 
 static unsigned long dma_mem_alloc(unsigned long size)
 {
-       return __get_dma_pages(GFP_KERNEL,get_order(size));
+       return __get_dma_pages(GFP_KERNEL|__GFP_NORETRY,get_order(size));
 }