diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 99b8c59a0188..9cd94e43af81 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.49 1996/11/19 00:38:05 scottr Exp $
+#	$NetBSD: GENERIC,v 1.50 1996/12/17 07:22:30 scottr Exp $
 #
 # GENERIC
 
@@ -7,60 +7,60 @@ include	"arch/mac68k/conf/std.mac68k"
 maxusers	16
 
 # Standard system options
-options		DIAGNOSTIC		# DEBUG for extra kernel debugging
-options		KTRACE			# system call tracing support
-#options	KGDB			# support for kernel gdb
-#options	GDB			# support for normal gdb
-#options	KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
+options 	DIAGNOSTIC		# DEBUG for extra kernel debugging
+options 	KTRACE			# system call tracing support
+#options 	KGDB			# support for kernel gdb
+#options 	GDB			# support for normal gdb
+#options 	KGDBDEV=0xc01, KGDBRATE=38400	# device & baud rate
 
 # Filesystem options
-options		FIFO		# POSIX fifo support (in all filesystems)
-options		DDB
-options		FFS
-options		QUOTA		# fast filesystem with user and group quotas
-options		MFS		# memory-based filesystem
-#options	NFSSERVER	# Sun NFS-compatible filesystem
-options		NFSCLIENT	# Sun NFS-compatible filesystem
-options		NULLFS		# Null (formerly loop-back) filesystem
-options		CD9660		# ISO-9660 w/ RockRidge
-options		KERNFS		# kernel data-structure filesystem
-options		FDESC		# user file descriptor filesystem
-#options	UMAPFS		# uid/gid remapping filesystem
-#options	LFS		# Log-based filesystem (still experimental)
-#options	PORTAL		# portal filesystem (still experimental)
-options		PROCFS		# Process filesystem
+options 	FIFO		# POSIX fifo support (in all filesystems)
+options 	DDB
+options 	FFS
+options 	QUOTA		# fast filesystem with user and group quotas
+options 	MFS		# memory-based filesystem
+#options 	NFSSERVER	# Sun NFS-compatible filesystem
+options 	NFSCLIENT	# Sun NFS-compatible filesystem
+options 	NULLFS		# Null (formerly loop-back) filesystem
+options 	CD9660		# ISO-9660 w/ RockRidge
+options 	KERNFS		# kernel data-structure filesystem
+options 	FDESC		# user file descriptor filesystem
+#options 	UMAPFS		# uid/gid remapping filesystem
+#options 	LFS		# Log-based filesystem (still experimental)
+#options 	PORTAL		# portal filesystem (still experimental)
+options 	PROCFS		# Process filesystem
 
-options		SCSI
-#options	SCSIDEBUG
+options 	SCSI
+#options 	SCSIDEBUG
 
 # Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-options		COMPAT_42
-options		COMPAT_43
-options		NS
-options		MAPMEM
-options		SYSVSHM,SYSVSEM,SYSVMSG
-options		PPP_BSDCOMP,PPP_DEFLATE
+options 	INET
+options 	TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+options 	GATEWAY		# IP packet forwarding
+#options 	ISO		# OSI networking
+#options 	TPIP
+#options 	EON
+options 	COMPAT_42
+options 	COMPAT_43
+options 	NS
+options 	MAPMEM
+options 	SYSVSHM,SYSVSEM,SYSVMSG
+options 	PPP_BSDCOMP,PPP_DEFLATE
 
 # Mac-specific options
-options		M68040
-options		M68030
-options		M68020		# Must have 68851 PMMU
-options		FPSP
-options		FPU_EMULATE
-options		COMPAT_NOMID
-options		COMPAT_SUNOS
-options		COMPAT_09
-options		COMPAT_10
+options 	M68040
+options 	M68030
+options 	M68020		# Must have 68851 PMMU
+options 	FPSP
+options 	FPU_EMULATE
+options 	COMPAT_NOMID
+options 	COMPAT_SUNOS
+options 	COMPAT_09
+options 	COMPAT_10
 options 	COMPAT_11
 options 	COMPAT_12
 #options 	COMPAT_M68K4K	# compatibility with NetBSD/m68k4k binaries
-options		ZS_CONSOLE_ABORT
+options 	ZS_CONSOLE_ABORT
 options 	DISABLE_EXT_CACHE # Don't use IIci external cache
 
 config		netbsd	swap generic
@@ -79,9 +79,12 @@ grf*		at macvid?
 # Attach ite semantics to the appropriate grf device
 ite0		at grf?
 
+# Use only one of ncrscsi or sbc
 ncrscsi0	at obio?		# SCSI NCR 5380
-esp0		at obio?		# SCSI NCR 53C96
-esp1		at obio?		# SCSI NCR 53C96
+#sbc0		at obio? flags 0x1	# MI NCR 5380 SCSI Bus Controller
+
+esp0		at obio?		# SCSI NCR 53C9x
+esp1		at obio?		# SCSI NCR 53C9x
 
 scsibus*	at scsi?
 sd*	at scsibus? target ? lun ?	# SCSI disk drives