sync to 0616, retaining local diffs

1 files changed, 0 insertions, 123 deletions

diff --git a/sys/arch/alpha/conf/GENERIC_NFS b/sys/arch/alpha/conf/GENERIC_NFS
deleted file mode 100644
index cb7f540af64..00000000000
--- a/sys/arch/alpha/conf/GENERIC_NFS
+++ /dev/null
@@ -1,123 +0,0 @@
-#	$NetBSD: GENERIC_NFS,v 1.4 1995/12/20 00:14:16 cgd Exp $
-#
-# Generic Alpha kernel.  Enough to get booted, etc., but not much more.
-
-include	"std.alpha"
-
-maxusers 8
-
-# CPU Support
-options		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
-options		DEC_3000_300	# Pelican etc:	3000/300*
-options		DEC_2100_A50	# Avanti etc:	AlphaStation 400, 200, etc.
-options		DEC_KN20AA	# KN20AA:	AlphaStation 600
-options		DEC_AXPPCI_33	# NoName:	AXPpci33, etc.
-#options	DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
-
-# needs to be set per system
-options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
-options		DST=1			# Daylight savings rules (for param.c)
-
-# Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
-options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
-options		KTRACE			# System call tracing support
-
-# File system options
-options		FIFO		# POSIX fifo support (in all file systems)
-options		FFS		# Fast file system
-options		MFS		# Memory-based file system
-options		NFSSERVER	# Sun NFS-compatible file system server
-options		NFSCLIENT	# Sun NFS-compatible file system client
-
-# Networking options
-options		INET		# Internet protocol suite
-
-# 4.3BSD compatibility.  Should be optional, but necessary for now.
-options		COMPAT_43
-
-# Binary compatibility with previous versions of NetBSD.
-options		COMPAT_10
-
-# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
-#options	COMPAT_OSF1
-
-# Loadable Kernel Modules
-options		LKM
-
-# Disable kernel security.
-#options	INSECURE
-
-# Misc. options
-options		PCIVERBOSE	# recognize "unknown" PCI devices
-
-config		netbsd_nfs	root on nfs swap on nfs
-
-mainbus0 at	root
-cpu*	at	mainbus0
-
-# TurboChannel host bus adapter support
-tcasic*	at	mainbus0
-
-# TurboChannel bus support
-tc*	at	tcasic?
-
-# TurboChannel devices
-ioasic0	at	tc? slot ? offset ?
-clock0	at	ioasic? offset ?
-le0	at	ioasic? offset ?
-scc0	at	ioasic? offset ?
-scc1	at	ioasic? offset ?
-tcds0	at	tc? slot ? offset ?
-esp0	at	tcds? slot ?
-esp1	at	tcds? slot ?
-#sfb*	at	tc? slot ? offset ?
-
-# PCI host bus adapter support
-apecs*	at	mainbus?
-cia*	at	mainbus?
-lca*	at	mainbus?
-
-# PCI bus support
-pci*	at	apecs?
-pci*	at	cia?
-pci*	at	lca?
-pci*	at	ppb?
-
-# PCI devices
-de*	at	pci?
-ncr*	at	pci?
-pceb*	at	pci?
-pcivga*	at	pci?
-ppb*	at	pci?
-sio*	at	pci?
-tga*	at	pci?
-
-# ISA/EISA bus support
-isa*	at	pceb?
-eisa*	at	pceb?
-isa*	at	sio?
-
-# ISA devices
-clock0	at	isa? port 0x70
-pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
-#pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
-com0	at	isa? port 0x3f8 irq 4		# standard serial ports
-com1	at	isa? port 0x2f8 irq 3
-lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
-#wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
-
-# SCSI bus support
-scsibus* at	esp?
-scsibus* at	ncr?
-
-# SCSI devices
-sd*	at	scsibus? target ? lun ?
-st*	at	scsibus? target ? lun ?
-cd*	at	scsibus? target ? lun ?
-
-pseudo-device	bpfilter
-pseudo-device	loop
-pseudo-device	pty
-pseudo-device	sl
-pseudo-device	vnd