use /sys/conf/GENERIC

1 files changed, 4 insertions, 54 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 9b48b800c29..2d22400f991 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$OpenBSD: GENERIC,v 1.23 1997/07/11 02:33:59 millert Exp $
+#	$OpenBSD: GENERIC,v 1.24 1997/07/21 23:21:50 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 
 machine	alpha
-option		SWAPPAGER, DEVPAGER
-maxusers 8
+
+include "../../../conf/GENERIC"
 
 # CPU Support
 option		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
@@ -16,61 +16,19 @@ option		DEC_AXPPCI_33	# NoName:	AXPpci33, etc.
 option		DEC_EB164	# EB164:	AlphaPC 164
 #option		DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 
-# needs to be set per system
-option		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
-option		DST=1			# Daylight savings rules (for param.c)
-
-# Standard system options
-#option		DEBUG, DIAGNOSTIC	# Extra kernel debugging
-option		KTRACE			# System call tracing support
-option		BOOT_CONFIG		# User kernel configuration
-option		DDB			# not yet supported
-
-# File system options
-option		FIFO		# POSIX fifo support (in all file systems)
-option		FFS		# Fast file system
-option		MFS		# Memory-based file system
-option		NFSSERVER	# Sun NFS-compatible file system server
-option		NFSCLIENT	# Sun NFS-compatible file system client
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		KERNFS		# /kern                                    
-option		PROCFS		# /proc                                  
-option		NULLFS		# loopback file system                    
-
-# Networking options
-option		INET		# Internet protocol suite
-
-# 4.3BSD compatibility.  Should be optional, but necessary for now.
-option		COMPAT_43
-
-# Binary compatibility with previous versions of NetBSD.
-#option		COMPAT_09
-option		COMPAT_10
-option		COMPAT_11
-option		COMPAT_12
-
-# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
-#option		COMPAT_OSF1
+#option		COMPAT_OSF1	# OSF/1 binary compatibility -- BROKEN
 
 # Disklabel compatibility options
 option		DISKLABEL_ALL	# All of the ones mentined below
 #option		DISKLABEL_ALPHA	# Redundant, just here for completeness
 #option		DISKLABEL_I386	# i386/arc style of partitioning
 
-# Loadable Kernel Modules
-option		LKM
-
-# Disable kernel security.
-#option		INSECURE
-
 # Misc. options
 option		EISAVERBOSE		# recognize "unknown" EISA devices
 option		PCIVERBOSE		# recognize "unknown" PCI devices
 option		TCVERBOSE		# recognize "unknown" TC devices
 
 config		bsd	swap generic
-#config		bsd	root on sd0 swap on sd0
-#config		bsd	root nfs swap nfs
 
 mainbus0 at	root
 cpu*	at	mainbus0
@@ -166,11 +124,3 @@ wscons*	at	cfb?
 wscons*	at	vga?
 wscons*	at	sfb?
 wscons*	at	tga?
-
-pseudo-device	bpfilter	16
-pseudo-device	loop
-pseudo-device	pty		64
-pseudo-device	rd		1
-pseudo-device	sl		4
-pseudo-device	vnd		4
-pseudo-device	ccd		4