--- Gnu-Mach/linux/src/drivers/scsi/aha152x.c	2020/09/02 04:41:40	1.1
+++ Gnu-Mach/linux/src/drivers/scsi/aha152x.c	2020/09/02 04:46:32	1.1.1.2
@@ -20,53 +20,7 @@
  * General Public License for more details.
  *
  *
- * $Id: aha152x.c,v 1.1 2020/09/02 04:41:40 root Exp $
- *
- * $Log: aha152x.c,v $
- * Revision 1.1  2020/09/02 04:41:40  root
- * Initial revision
- *
- * Revision 1.1  1999/04/26 05:54:09  tb
- * 1998-11-30  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
- *
- * 	Clean up linux emulation code to make it architecture-independent
- * 	as much as possible.
- *
- * 	* linux: Renamed from linuxdev.
- * 	* Makefile.in (objfiles): Add linux.o instead of linuxdev.o.
- * 	(MAKE): New variable. Used for the linux.o target.
- * 	* configure.in: Add AC_CHECK_TOOL(MAKE, make).
- * 	* i386/i386/spl.h: Include <i386/ipl.h>, for compatibility with
- * 	OSF Mach 3.0. Suggested by Elgin Lee <ehl@funghi.com>.
- * 	* linux/src: Renamed from linux/linux.
- * 	* linux/dev: Renamed from linux/mach.
- * 	* linux/Drivers.in (AC_INIT): Use dev/include/linux/autoconf.h,
- * 	instead of mach/include/linux/autoconf.h.
- * 	* Makefile.in (all): Target ../linux.o instead of ../linuxdev.o.
- * 	* linux/dev/drivers/block/genhd.c: Include <machine/spl.h> instead
- * 	of <i386/ipl.h>.
- * 	* linux/dev/drivers/net/auto_irq.c: Remove unneeded header files,
- * 	<i386/ipl.h> and <i386/pic.h>.
- * 	* linux/dev/init/main.c: Many i386-dependent codes moved to ...
- * 	* linux/dev/arch/i386/irq.c: ... here.
- * 	* linux/dev/arch/i386/setup.c: New file.
- * 	* linux/dev/arch/i386/linux_emul.h: Likewise.
- * 	* linux/dev/arch/i386/glue/timer.c: Merged into sched.c.
- * 	* linux/dev/arch/i386/glue/sched.c: Include <machine/spl.h> instead
- * 	of <i386/ipl.h>, and moved to ...
- * 	* linux/dev/kernel/sched.c: ... here.
- * 	* linux/dev/arch/i386/glue/block.c: Include <machine/spl.h> and
- * 	<linux_emul.h>, instead of i386-dependent header files, and
- * 	moved to ...
- * 	* linux/dev/glue/blocl.c: ... here.
- * 	* linux/dev/arch/i386/glue/net.c: Include <machine/spl.h> and
- * 	<linux_emul.h>, instead of i386-dependent header files, and
- * 	moved to ...
- * 	* linux/dev/glue/net.c: ... here.
- * 	* linux/dev/arch/i386/glue/misc.c: Remove `x86' and moved to ...
- * 	* linux/dev/glue/misc.c: ... here.
- * 	* linux/dev/arch/i386/glue/kmem.c: Moved to ...
- * 	* linux/dev/glue/kmem.c: ... here.
+ * $Id: aha152x.c,v 1.1.1.2 2020/09/02 04:46:32 root Exp $
  *
  * Revision 1.18  1996/09/07 20:10:40  fischer
  * - fixed can_queue handling (multiple outstanding commands working again)
@@ -365,6 +319,10 @@
 
  **************************************************************************/
 
+#ifdef MACH
+#define AUTOCONF	1
+#endif
+
 #ifdef PCMCIA
 #define MODULE
 #endif
@@ -1581,7 +1539,7 @@ void aha152x_done(struct Scsi_Host *shpn
 void aha152x_intr(int irqno, void *dev_id, struct pt_regs * regs)
 {
   struct Scsi_Host *shpnt = aha152x_host[irqno-IRQ_MIN];
-  unsigned int flags;
+  unsigned long flags;
   int done=0, phase;
 
 #if defined(DEBUG_RACE)