Resent-Date: Tue, 19 Jan 1999 10:43:26 +0100 (MET)
Date: Tue, 19 Jan 1999 09:43:15 GMT
From: Jesper Skov <jskov@cygnus.co.uk>
To: Jes.Sorensen@cern.ch, linux-m68k@lists.linux-m68k.org
Subject: 2.2.0pre7
Resent-From: linux-m68k@phil.uni-sb.de

./drivers/block/z2ram.c:   compiler error (missing header)
./drivers/scsi/amiga7xx.c: compiler error (missing header)
./drivers/scsi/53c7xx.c:   prevents crash when mounting CDROM with
                           empty tray.

diff -u --recursive -B --exclude-from=/home/jskov/lib/diff-excludes -P /home/jskov/kernel/dist/linux-2.2.0pre7/drivers/block/z2ram.c ./drivers/block/z2ram.c
--- /home/jskov/kernel/dist/linux-2.2.0pre7/drivers/block/z2ram.c	Mon Jan 11 20:30:10 1999
+++ ./drivers/block/z2ram.c	Mon Jan 11 21:39:32 1999
@@ -32,10 +32,7 @@
 #include <linux/malloc.h>
 #include <linux/blk.h>
 #include <linux/init.h>
-
-#if defined(MODULE)
 #include <linux/module.h>
-#endif
 
 #include <asm/setup.h>
 #include <asm/bitops.h>
diff -u --recursive -B --exclude-from=/home/jskov/lib/diff-excludes -P /home/jskov/kernel/dist/linux-2.2.0pre7/drivers/scsi/53c7xx.c ./drivers/scsi/53c7xx.c
--- /home/jskov/kernel/dist/linux-2.2.0pre7/drivers/scsi/53c7xx.c	Mon Jan 11 20:30:15 1999
+++ ./drivers/scsi/53c7xx.c	Mon Jan 11 20:48:01 1999
@@ -3197,7 +3197,6 @@
     case MODE_SELECT: 
     case WRITE_6:
     case WRITE_10:
-    case START_STOP: /* also SCAN, which may do DATA OUT */
 #if 0
 	printk("scsi%d : command is ", host->host_no);
 	print_command(cmd->cmnd);
@@ -3218,6 +3217,7 @@
      */
     case TEST_UNIT_READY:
     case ALLOW_MEDIUM_REMOVAL:
+    case START_STOP:
     	datain = dataout = 0;
 	break;
     /*
diff -u --recursive -B --exclude-from=/home/jskov/lib/diff-excludes -P /home/jskov/kernel/dist/linux-2.2.0pre7/drivers/scsi/amiga7xx.c ./drivers/scsi/amiga7xx.c
--- /home/jskov/kernel/dist/linux-2.2.0pre7/drivers/scsi/amiga7xx.c	Mon Jan 18 20:26:47 1999
+++ ./drivers/scsi/amiga7xx.c	Mon Jan 18 21:10:20 1999
@@ -22,6 +22,7 @@
 #include <asm/amigahw.h>
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/init.h>
 
 #include "scsi.h"
 #include "hosts.h"