patch-2.2.18 linux/drivers/acorn/block/fd1772.c

• Lines: 39
• Date: Fri Sep 15 23:31:12 2000
• Orig file: v2.2.17/drivers/acorn/block/fd1772.c
• Orig date: Fri Apr 21 12:45:50 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/acorn/block/fd1772.c linux/drivers/acorn/block/fd1772.c
@@ -114,6 +114,10 @@
  *		  I wish I knew why that timer didn't work.....
  *
  *     16/11/96 - Fiddled and frigged for 2.0.18
+ *
+ * DAG 30/01/99 - Started frobbing for 2.2.1
+ * DAG 20/06/99 - A little more frobbing:
+       Included include/asm/uaccess.h for get_user/put_user
  */
 
 #include <linux/sched.h>
@@ -136,14 +140,16 @@
 #include <asm/dma.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
+#include <asm/ioc.h>
 #include <asm/irq.h>
-#include <asm/irq-no.h>
 #include <asm/pgtable.h>
 #include <asm/segment.h>
+#include <asm/uaccess.h>
+
 
 #define MAJOR_NR FLOPPY_MAJOR
 #define FLOPPY_DMA 0
-#include "blk.h"
+#include <linux/blk.h>
 
 /* Note: FD_MAX_UNITS could be redefined to 2 for the Atari (with
  * little additional rework in this file). But I'm not yet sure if
@@ -1598,7 +1604,7 @@
 };
 
 
-int floppy_init(void)
+int fd1772_init(void)
 {
 	int i;