On Mon, 29 Apr 1996, Paul Goyette wrote:

> Well, after this morning's sup, I tried to config my usual kernel, and 
> got the following errors:
> 
> 	files.mac68k:57: syntax error
> 	files.mac68k:67: redefinition of `sbc'
> 	files.mac68k:68: redefinition of `sbc'
> 	*** Stop.

This is probably due to me renaming the sbc driver, and causing a conflict
when Allen went to commit his reordered version.  I just cleaned it up,
but in the mean time, here's the patch:

Index: files.mac68k
===================================================================
RCS file: /a/cvsroot/src/sys/arch/mac68k/conf/files.mac68k,v
retrieving revision 1.43
diff -c -r1.43 files.mac68k
*** files.mac68k	1996/04/28 19:18:42	1.43
--- files.mac68k	1996/04/29 21:33:46
***************
*** 54,60 ****
  attach	ncr96scsi at mainbus
  file	arch/mac68k/dev/scsi96.c	ncr96scsi needs-flag
  
- <<<<<<< files.mac68k
  device	ser: tty
  attach	ser at mainbus
  file	arch/mac68k/dev/ser.c		ser needs-flag
--- 54,59 ----
***************
*** 63,72 ****
  device	fpu
  attach	fpu at mainbus
  file	arch/mac68k/mac68k/fpu.c	fpu
- 
- device	sbc: scsi, ncr5380sbc
- attach	sbc at mainbus
- file	arch/mac68k/dev/sbc.c		sbc
  
  file	arch/m68k/m68k/copy.s
  file	arch/m68k/m68k/db_memrw.c	ddb
--- 62,67 ----