commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / arch / mips / lib / floppy-std.c

diff --git a/arch/mips/lib/floppy-std.c b/arch/mips/lib/floppy-std.c
index ee7a895..38151be 100644 (file)
--- a/arch/mips/lib/floppy-std.c
+++ b/arch/mips/lib/floppy-std.c
@@ -5,7 +5,7 @@
  *
  * Access the floppy hardware on PC style hardware
  *
- * Copyright (C) 1996, 1997, 1998 by Ralf Baechle
+ * Copyright (C) 1996, 1997, 1998, 2003 by Ralf Baechle
  */
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -15,13 +15,13 @@
 #include <linux/linkage.h>
 #include <linux/types.h>
 #include <linux/mm.h>
+
 #include <asm/bootinfo.h>
 #include <asm/cachectl.h>
 #include <asm/dma.h>
 #include <asm/floppy.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/mc146818rtc.h>
 #include <asm/pgtable.h>
 
 /*
@@ -104,7 +104,7 @@ static unsigned long std_fd_dma_mem_alloc(unsigned long size)
 {
        unsigned long mem;
 
-       mem = __get_dma_pages(GFP_KERNEL,get_order(size));
+       mem = __get_dma_pages(GFP_KERNEL, get_order(size));
 
        return mem;
 }