--- drivers/block/ll_rw_blk.c.predag    Sun Jun 20 00:00:17 1999
+++ drivers/block/ll_rw_blk.c   Sat Jun 19 23:58:40 1999
@@ -787,6 +787,9 @@
 #ifdef CONFIG_ATARI_FLOPPY
        atari_floppy_init();
 #endif
+#ifdef CONFIG_BLK_DEV_FD1772
+       floppy_init();
+#endif
 #ifdef CONFIG_BLK_DEV_FD
        floppy_init();
 #endif


--- ./drivers/acorn/block/fd1772.c.predag	Sun Jun 20 00:04:51 1999
+++ ./drivers/acorn/block/fd1772.c	Sun Jun 20 00:06:03 1999
@@ -116,6 +116,8 @@
  *     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>
@@ -142,6 +144,8 @@
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 #include <asm/segment.h>
+#include <asm/uaccess.h>
+
 
 #define MAJOR_NR FLOPPY_MAJOR
 #define FLOPPY_DMA 0
--- ./arch/arm/kernel/dma-arc.c.predag	Sun Jun 20 00:28:27 1999
+++ ./arch/arm/kernel/dma-arc.c	Sun Jun 20 00:28:35 1999
@@ -15,8 +15,11 @@
 
 #include "dma.h"
 
+#define DEBUG
+
 int arch_request_dma(dmach_t channel, dma_t *dma, const char * dev_id)
 {
+  printk("arch_request_dma channel=%d F0=%d F1=%d\n",channel,DMA_VIRTUAL_FLOPPY0,DMA_VIRTUAL_FLOPPY1);
 	if (channel == DMA_VIRTUAL_FLOPPY0 ||
 	    channel == DMA_VIRTUAL_FLOPPY1)
 		return 0;
@@ -30,8 +33,9 @@
 
 void arch_enable_dma(dmach_t channel, dma_t *dma)
 {
+  printk("arch_enable_dma channel=%d F0=%d F1=%d\n",channel,DMA_VIRTUAL_FLOPPY0,DMA_VIRTUAL_FLOPPY1);
 	switch (channel) {
-#ifdef CONFIG_BLK_DEV_FD
+#ifdef CONFIG_BLK_DEV_FD1772
 	case DMA_VIRTUAL_FLOPPY0: { /* Data DMA */
 		switch (dma->dma_mode) {
 		case DMA_MODE_READ: /* read */
@@ -100,7 +104,7 @@
 int arch_get_dma_residue(dmach_t channel, dma_t *dma)
 {
   switch (channel) {
-#ifdef CONFIG_BLK_DEV_FD
+#ifdef CONFIG_BLK_DEV_FD1772
     case DMA_VIRTUAL_FLOPPY0: { /* Data DMA */
         extern unsigned int fdc1772_bytestogo;