single comment in GENERIC replaces a file that gets out of date; discussed by many

2 files changed, 2 insertions, 527 deletions

diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
deleted file mode 100644
index 69c8cf40759..00000000000
--- a/sys/arch/i386/conf/DISKLESS
+++ /dev/null
@@ -1,526 +0,0 @@
-#	$OpenBSD: DISKLESS,v 1.54 2004/09/17 11:32:53 msf Exp $
-#
-# DISKLESS -- Generic machine setup for diskless boot.
-# This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
-# and will use NFS for root and swap.  (No local disk space needed.)
-#
-
-machine		i386		# architecture, used by config; REQUIRED
-
-option		I386_CPU	# CPU classes; at least one is REQUIRED
-option		I486_CPU
-option		I586_CPU
-option		I686_CPU
-option		GPL_MATH_EMULATE	# floating point emulation
-
-#option		VM86		# Virtual 8086 emulation
-#option		USER_LDT	# user-settable LDT; used by WINE
-option		APERTURE	# in-kernel aperture driver for XFree86
-
-#option		KGDB		# Remote debugger support; exclusive of DDB
-#option		"KGDB_DEVNAME=\"pccom\"",KGDBADDR=0x2f8,KGDBRATE=9600
-
-option		BOOT_CONFIG	# add support for boot -c
-#option		DUMMY_NOPS	# speed hack; recommended
-#makeoptions	DEBUG="-g"	# compile full symbol table
-#makeoptions	PROF="-pg"	# build profiled kernel
-#option		GPROF		# kernel profiling, kgmon(8)
-option		DIAGNOSTIC	# internal consistency checks
-option		KTRACE		# system call tracing, a la ktrace(1)
-option		KMEMSTATS	# collect malloc(9) statistics
-#option		INSECURE	# default to secure
-
-option		CRYPTO		# Cryptographic framework
-
-maxusers	32		# estimated number of users
-option		TIMEZONE=0	# time zone to adjust RTC time by
-option		DST=0		# daylight saving time used by RTC
-
-option		DDB		# in-kernel debugger
-#option		DDB_SAFE_CONSOLE # allow break into ddb during boot
-
-option		SYSVMSG		# System V-like message queues
-option		SYSVSEM		# System V-like semaphores
-option		SYSVSHM		# System V-like memory sharing
-
-option		UVM_SWAP_ENCRYPT# support encryption of pages going to swap
-
-option		COMPAT_43	# Kernel compatibility with 4.3BSD
-#option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
-
-option		COMPAT_SVR4	# binary compatibility with SVR4
-#option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
-option		COMPAT_LINUX	# binary compatibility with Linux
-option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
-option		COMPAT_BSDOS	# binary compatibility with BSD/OS
-
-option		LKM		# loadable kernel modules
-
-#option		FFS		# UFS
-#option		FFS_SOFTUPDATES	# Soft updates
-#option		QUOTA		# UFS quotas
-option		MFS		# memory file system
-#option		EXT2FS		# Second Extended Filesystem
-#option		XFS		# xfs filesystem
-
-option		TCP_SACK	# Selective Acknowledgements for TCP
-#option		TCP_FACK	# Forward Acknowledgements for TCP
-#option		TCP_SIGNATURE	# TCP MD5 Signatures, for BGP routing sessions
-
-option		NFSCLIENT	# Network File System client
-#option		NFSSERVER	# Network File System server
-
-#option		CD9660		# ISO 9660 + Rock Ridge file system
-#option		MSDOSFS		# MS-DOS file system
-option		FDESC		# /dev/fd
-option		FIFO		# FIFOs; RECOMMENDED
-option		KERNFS		# /kern
-option		NULLFS		# loopback file system
-option		PORTAL		# dynamically created filesystem objects
-option		PROCFS		# /proc
-option		UMAPFS		# NULLFS + uid and gid remapping
-option		UNION		# union file system
-
-option		INET		# IP + ICMP + TCP + UDP
-option		INET6		# IPv6 (needs INET)
-option		PULLDOWN_TEST	# use m_pulldown for IPv6 packet parsing
-option		IPSEC		# IPsec
-#option		KEY		# PF_KEY (implied by IPSEC)
-#option		NS		# XNS
-#option		IPX		# IPX+SPX
-#option		IPXIP		# IPX tunneling over IP
-#option		NETATALK	# AppleTalk
-#option		NSIP		# XNS tunneling over IP
-#option		CCITT,LLC,HDLC	# X.25
-option		PPP_BSDCOMP	# PPP BSD compression
-option		PPP_DEFLATE
-#option		MROUTING	# Multicast router
-
-config		bsd	root on nfs swap on nfs
-
-mainbus0 at root
-
-cpu0	at mainbus?
-bios0	at mainbus0
-apm0	at bios0 flags 0x0000	# flags 0x0101 to force protocol version 1.1
-pcibios0 at bios0 flags 0x0000	# use 0x30 for a total verbose
-
-isa0	at mainbus0
-isa0	at pcib?
-eisa0	at mainbus0
-pci*	at mainbus0
-
-option		PCIVERBOSE
-#option		EISAVERBOSE
-#option		PCMCIAVERBOSE
-option		USBVERBOSE
-
-pchb*	at pci?			# PCI-Host bridges
-ppb*	at pci?			# PCI-PCI bridges
-pci*	at ppb?
-pci*	at pchb?
-pcib*	at pci?			# PCI-ISA bridges (do nothing)
-
-# ISA PCMCIA controllers
-pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
-pcic1	at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
-pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
-#tcic0	at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
-
-# PCI PCMCIA controllers
-pcic*	at pci?
-pcic*	at isapnp?
-
-# PCMCIA bus support
-pcmcia*	at pcic?
-#pcmcia* at tcic?
-
-# CardBus bus support
-cardbus*	at cardslot?
-pcmcia*		at cardslot?
-cbb*		at pci?
-cardslot*	at cbb?
-
-# PCI USB Controllers
-uhci*	at pci?				# Universal Host Controller (Intel)
-ohci*	at pci?				# Open Host Controller
-
-# USB bus support
-usb*	at uhci?
-usb*	at ohci?
-
-uhub*	at usb?			# USB Hubs
-uhub*	at uhub?		# USB Hubs
-umodem*	at uhub?		# USB Modems/Serial
-ucom*	at umodem?
-uvisor*	at uhub?		# Handspring Visor
-ucom*	at uvisor?
-uftdi*	at uhub?
-ucom*	at uftdi?
-uaudio* at uhub?		# USB Audio
-ulpt*	at uhub?		# USB Printers
-umass*	at uhub?		# USB Mass Storage devices
-scsibus* at umass?
-uhidev*	at uhub?
-ums*	at uhidev?
-wsmouse* at ums? mux 0
-ukbd*	at uhidev?
-wskbd*	at ukbd? mux 1
-uhid*	at uhidev?
-aue*	at uhub?		# ADMtek AN986 Pegasus Ethernet
-cue*	at uhub?		# CATC USB-EL1201A based Ethernet
-kue*	at uhub?		# Kawasaki KL5KUSB101B based Ethernet
-upl*	at uhub?		# Prolific PL2301/PL2302 host-to-host `network'
-urio*	at uhub?		# Diamond Multimedia Rio 500
-uscanner* at uhub?		# USB Scanners
-usscanner* at uhub?		# USB SCSI scanners, e.g., HP5300
-scsibus* at usscanner?
-#uyap*	at uhub?		# Y@P firmware loader
-ugen*	at uhub?		# USB Generic driver
-
-puc*	at pci?			# PCI "universal" communication device
-
-npx0	at isa? port 0xf0 irq 13	# math coprocessor
-isadma0	at isa?
-isapnp0	at isa?
-
-option	WSDISPLAY_COMPAT_USL		# VT handling
-option	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
-option	WSDISPLAY_DEFAULTSCREENS=6
-option	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
-
-pckbc0		at isa?		# PC keyboard controller
-pckbd*		at pckbc?	# PC keyboard
-pms*		at pckbc?	# PS/2 mouse for wsmouse
-pmsi*		at pckbc?	# PS/2 "Intelli"mouse for wsmouse
-vga0		at isa?
-vga*		at pci?
-pcdisplay0	at isa?		# CGA, MDA, EGA, HGA
-wsdisplay*	at vga?
-wsdisplay*	at pcdisplay?
-wskbd*		at pckbd?
-wsmouse*	at pms? mux 0
-wsmouse*	at pmsi? mux 0
-
-pcppi0		at isa?
-sysbeep0	at pcppi?
-
-pccom0	at isa? port 0x3f8 irq 4	# standard PC serial ports
-pccom1	at isa? port 0x2f8 irq 3
-pccom2	at isa? port 0x3e8 irq 5
-#pccom3	at isa? port 0x2e8 irq 9	# (conflicts with some video cards)
-ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial card
-#ast1	at isa? port 0x2a0 irq 6	# 2nd AST 4-port serial card
-#pccom*	at ast?
-#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#pccom*	at boca?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#pccom*	at rtfps?
-#hsq0	at isa? port 0x140 irq 10	# Hostess 4-port serial card
-#pccom*	at hsq?
-pccom*	at pcmcia?			# PCMCIA modems/serial ports
-pccom*	at isapnp?
-#pccom*	at puc?
-
-# option for using CD1400 handshaking for incoming data
-# requires a special cable that exchanges the RTS and DTR lines
-# options CY_HW_RTS
-cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom serial card
-#cy*	at pci?				# PCI cyclom serial card
-
-lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
-lpt1	at isa? port 0x278
-lpt2	at isa? port 0x3bc
-#lpt*	at puc?
-
-lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
-lms1	at isa? port 0x238 irq 5
-mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
-mms1	at isa? port 0x238 irq 5
-
-wsmouse*	at lms? mux 0
-wsmouse*	at mms? mux 0
-
-#aac*	at pci?			# Adaptec FSA RAID controllers
-#scsibus* at aac?
-#adv*	at pci?			# AdvanSys 1200A/B and ULTRA SCSI
-#scsibus* at adv?
-#adw*	at pci?			# AdvanSys ULTRA WIDE SCSI
-#scsibus* at adw?
-#pcscp*	at pci?			# AMD 53c974 PCscsi-PCI SCSI
-#scsibus* at pcscp?
-#aha0	at isa? port 0x330	# Adaptec 154[02] SCSI controllers
-#aha1	at isa? port 0x334	# Adaptec 154[02] SCSI controllers
-#aha*	at isapnp?
-#scsibus* at aha?
-#ahb*	at eisa?		# Adaptec 174[024] SCSI controllers
-#scsibus* at ahb?
-#ahc0	at isa?			# Adaptec 284x SCSI controllers
-#ahc*	at eisa?		# Adaptec 274x, aic7770 SCSI controllers
-#ahc*	at pci?			# Adaptec 2940 SCSI controllers
-#scsibus* at ahc?
-#dpt*	at pci?			# DPT SmartCache/SmartRAID PCI
-#dpt*	at eisa?		# DPT SmartCache/SmartRAID EISA
-#scsibus* at dpt?
-#gdt*	at pci?			# ICP Vortex GDT RAID controllers
-#scsibus* at gdt?
-#twe*	at pci?			# 3ware Escalade RAID controllers
-#scsibus* at twe?
-#aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
-#aic*	at pcmcia?		# PCMCIA based aic SCSI controllers
-#scsibus* at aic?
-#esp*	at pcmcia?		# PCMCIA based NCR 53C9X SCSI
-#scsibus* at esp?
-#bha0	at isa? port 0x330	# BusLogic [57]4X SCSI controllers
-#bha1	at isa? disable port 0x334	# BusLogic [57]4X SCSI controllers
-#bha2	at isa? disable
-#bha*	at pci?
-#bha*	at eisa?		# XXX eisa still runs in isa-compat
-#scsibus* at bha?
-#ncr*	at pci?			# NCR 538XX SCSI controllers(old)
-#scsibus* at ncr?
-#siop*	at pci?			# NCR 538XX SCSI controllers(new)
-#scsibus* at siop?
-#sea0	at isa? iomem 0xc8000 irq 5	# Seagate ST0[12] SCSI controllers
-#scsibus* at sea?
-#uha0	at isa? port 0x330	# UltraStor [13]4f SCSI controllers
-#uha1	at isa? port 0x334	# UltraStor [13]4f SCSI controllers
-#uha*	at eisa?		# UltraStor 24f SCSI controllers
-#scsibus* at uha?
-#wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
-#wds1	at isa? port 0x358 irq 11 drq 5
-#scsibus* at wds?
-#cac*	at pci?			# Compaq Smart ARRAY RAID controllers
-#cac*	at eisa?
-#scsibus* at cac?
-#iha*	at pci?			# Initio Ultra/UltraWide SCSI controllers
-#scsibus* at iha?
-#isp*	at pci?			# Qlogic ISP [12]0x0 SCSI/FibreChannel
-#scsibus* at isp?
-#ami*	at pci?			# AMI MegaRAID controllers
-#scsibus* at ami?
-
-sd*	at scsibus?		# SCSI disk drives
-st*	at scsibus?		# SCSI tape drives
-cd*	at scsibus?		# SCSI CD-ROM drives
-ch*	at scsibus?		# SCSI autochangers
-ss*	at scsibus?		# SCSI scanners
-uk*	at scsibus?		# unknown SCSI
-
-fdc0	at isa? disable port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
-fdc1	at isa? disable port 0x370
-fd*	at fdc?
-
-#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
-
-# IDE controllers
-pciide* at pci? disable flags 0x0000
-
-wdc0	at isa? disable port 0x1f0 irq 14 flags 0x00
-wdc1	at isa? disable port 0x170 irq 15 flags 0x00
-wdc*	at pcmcia? disable
-wdc*	at isapnp? disable
-
-# IDE hard drives
-wd*	at wdc? flags 0x0000
-wd*	at pciide? flags 0x0000
-
-# ATAPI<->SCSI
-atapiscsi* at wdc?
-atapiscsi* at pciide?
-scsibus* at atapiscsi?
-
-#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
-
-# Networking devices
-we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet
-we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
-#we2	at isa? port 0x280 iomem 0xd0000 irq 3	# WD/SMC 80x3 ethernet
-we*	at isapnp?
-ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet
-ne0	at isa? port 0x240 irq 9	# NE[12]000 ethernet
-ne1	at isa? port 0x300 irq 10	# NE[12]000 ethernet
-ne2	at isa? port 0x280 irq 9	# NE[12]000 ethernet
-ne*	at isapnp?			# NE[12]000 PnP ethernet
-eg0	at isa? port 0x310 irq 5	# 3C505/Etherlink+ ethernet
-el0	at isa? port 0x300 irq 9	# 3C501 ethernet
-ep0	at isa?				# 3C509 ethernet
-ep*	at isapnp?			# 3C509 PnP ethernet
-ep*	at isa?				# 3C509 ethernet
-ef*	at isapnp?			# 3C515 PnP ethernet
-ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
-#ie1	at isa? port 0x300 irq 10	# EtherExpress
-le0	at isa? port 0x360 irq 15 drq 6	# IsoLan, NE2100, and DEPCA
-ex0	at isa? port 0x320 irq 5	# Intel EtherExpress PRO/10
-#tr0	at isa? port 0xa20 iomem 0xd8000 # IBM TROPIC based Token-Ring
-#tr1	at isa? port 0xa24 iomem 0xd0000 # IBM TROPIC based Token-Ring
-#tr*	at isa?				 # 3COM TROPIC based Token-Ring
-ep0	at eisa?
-ep*	at eisa?			# 3C579 ethernet
-fea*	at eisa?			# DEC DEFEA FDDI
-lmc*	at pci?				# Lan Media Corp SSI/T3/HSSI
-le*	at pci?				# PCnet-PCI based ethernet
-le*	at isapnp?
-de*	at pci?				# DC21X4X-based ethernet
-fxp*	at pci?				# EtherExpress 10/100B ethernet
-fxp*	at cardbus?			# Intel PRO/100 ethernet
-ne*	at pci?				# NE2000-compat ethernet
-ep0	at pci?				# 3C59x ethernet
-ep*	at pci?				# 3C59x ethernet
-ne*	at pcmcia?			# PCMCIA based NE2000 ethernet
-ep*	at pcmcia?			# PCMCIA based 3C5xx ethernet
-sm*	at pcmcia?			# PCMCIA based sm ethernet
-xe*	at pcmcia?			# Xircom ethernet
-fpa*	at pci?				# DEC DEFPA FDDI
-xl*	at pci?				# 3C9xx ethernet
-xl*	at cardbus?			# 3C575/3C656 ethernet
-rl*	at pci?				# RealTek 81[23]9 ethernet
-tx*	at pci?				# SMC 83C170 EPIC ethernet
-tl*	at pci?				# Compaq Thunderlan ethernet
-vr*	at pci?				# VIA Rhine ethernet
-wb*	at pci?				# Winbond W89C840F ethernet
-sf*	at pci?				# Adaptec AIC-6915 ethernet
-sis*	at pci?				# SiS 900/7016 ethernet
-ste*	at pci?				# Sundance ST201 ethernet
-dc*	at pci?				# 21143, "tulip" clone ethernet
-dc*	at cardbus?			# 21143, "tulip" clone ethernet
-ti*	at pci?				# Alteon Tigon 1Gb ethernet
-skc*	at pci?				# SysKonnect GEnesis 984x
-sk*	at skc?				#  each port of above
-
-# Wireless network cards
-wi*	at pcmcia?			# WaveLAN IEEE 802.11DS
-#awi*	at pcmcia?			# Bay Networks IEEE 802.11FH
-#an*	at pci?				# Aironet IEEE 802.11DS
-an*	at pcmcia?			# Aironet IEEE 802.11DS
-#cnw*	at pcmcia?			# Xircom Netwave
-ray*	at pcmcia?			# Raylink Aviator2.4/Pro 802.11FH
-
-# Media Independent Interface (mii) drivers
-bmtphy*	at mii?				# Broadcom 10/100 PHYs
-eephy*	at mii?				# Marvell PHYs for Intel GigE
-exphy*	at mii?				# 3Com internal PHYs
-inphy*	at mii?				# Intel 82555 PHYs
-iophy*	at mii?				# Intel 82553 PHYs
-icsphy*	at mii?				# ICS 1890 PHYs
-lxtphy*	at mii?				# Level1 LXT970 PHYs
-nsphy*	at mii?				# NS and compatible PHYs
-nsphyter*	at mii?			# NS and compatible PHYs
-qsphy*	at mii?				# Quality Semi QS6612 PHYs
-sqphy*	at mii?				# Seeq 8x220 PHYs
-rlphy* at mii?				# RealTek 8139 internal PHYs
-#mtdphy*	at mii?			# Myson MTD972 PHYs
-dcphy*	at mii?				# Digital Clone PHYs
-amphy*	at mii?				# AMD 79C873 PHYs
-tqphy*	at mii?				# TDK 78Q212x PHYs
-brgphy*	at mii?				# Broadcom Gigabit PHYs
-xmphy*	at mii?				# XaQti XMAC-II PHYs
-ukphy*	at mii?				# "unknown" PHYs
-
-pss0	at isa? port 0x220 irq 7 drq 6	# Personal Sound System
-sp0	at pss0 port 0x530 irq 10 drq 0	# sound port driver
-
-eap*	at pci?				# Ensoniq AudioPCI S5016
-eso*	at pci?				# ESS Solo-1 PCI AudioDrive
-sv*	at pci?				# S3 SonicVibes (S3 617)
-neo*	at pci?				# NeoMagic 256AV/ZX
-cmpci*	at pci?				# C-Media CMI8338/8738
-auich*	at pci?				# i82801 ICH AC'97 audio
-clcs*	at pci?				# CS4280 CrystalClear audio
-clct*	at pci?				# CS4281 CrystalClear audio
-fms*	at pci?				# Forte Media FM801
-auvia*	at pci?				# VIA VT82C686A
-yds*	at pci?				# Yamaha YMF Audio
-maestro* at pci?			# ESS Maestro PCI
-sb0	at isa? port 0x220 irq 5 drq 1	# SoundBlaster
-sb*	at isapnp?
-ess*	at isapnp?			# ESS Tech ES188[78], ES888
-wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
-wss*	at isapnp?
-pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
-gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis UltraSound (drq2 is record drq)
-ym*	at isapnp?
-mpu*	at isapnp?
-
-# OPL[23] FM synthesizers
-#opl0	at isa? port 0x388	# use only if not attached to sound card
-opl*	at eso?
-opl*	at sb?
-opl*	at ess?
-opl*	at yds?
-
-# MIDI support
-midi*	at pcppi?		# MIDI interface to the PC speaker
-midi*	at sb?			# SB MPU401 port
-midi*	at opl?			# OPL FM synth
-midi*	at ym?
-midi*	at mpu?
-
-# The spkr driver provides a simple tone interface to the built in speaker.
-#spkr0	at pcppi?		# PC speaker
-
-#Audio Support
-audio*	at sb?
-audio*	at gus?
-audio*	at pas?
-audio*	at sp?
-audio*	at ess?
-audio*	at wss?
-audio*	at ym?
-audio*	at eap?
-audio*	at eso?
-audio*	at sv?
-audio*	at neo?
-audio*	at cmpci?
-audio*	at clcs?
-audio*	at clct?
-audio*	at auich?
-audio*	at fms?
-audio*	at auvia?
-audio*	at uaudio?
-audio*	at maestro?
-audio*	at yds?
-
-bktr0	at pci?
-
-# Joystick driver. Probe is a little strange; add only if you have one.
-#joy0	at isa? port 0x201
-joy*	at isapnp?
-
-#wdt0	at pci?			# Ind Computer Source PCI-WDT50x driver
-
-# crypto support
-hifn*	at pci?			# Hi/fn 7751 crypto card
-ubsec*	at pci?			# Bluesteel Networks 5xxx crypto card
-#ises*	at pci?			# Pijnenburg PCC-ISES
-
-pseudo-device	loop		2	# network loopback
-pseudo-device	bpfilter	8	# packet filter
-pseudo-device	sl		2	# CSLIP
-pseudo-device	ppp		2	# PPP
-pseudo-device	sppp			# Sync PPP/HDLC
-pseudo-device	tun		2	# network tunneling over tty
-pseudo-device	enc		1	# IPSEC needs the encapsulation interface
-pseudo-device	gre		1	# GRE encapsulation interface
-#pseudo-device	strip		1	# Starmode Radio IP interface
-
-pseudo-device	pty		64	# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
-pseudo-device	vnd		4	# paging to files
-#pseudo-device	ccd		4	# concatenated disk devices
-pseudo-device	ksyms		1	# kernel symbols device
-#pseudo-device	bridge		2	# network bridging support
-#pseudo-device	vlan 		2	# IEEE 802.1Q VLAN 
-
-pseudo-device	pctr		1
-pseudo-device	mtrr		1	# Memory range attributes control
-pseudo-device	sequencer	1
-#pseudo-device	raid		4	# RAIDframe disk driver
-# for IPv6
-pseudo-device	gif		4
-#pseudo-device	faith		1
-
-# mouse & keyboard multiplexor pseudo-devices
-pseudo-device	wsmux		2
-
-#option DEBUG_ISAPNP
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 1fd23dcb45e..3d827562493 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.391 2004/12/19 16:09:17 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.392 2004/12/19 20:15:47 deraadt Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -35,6 +35,7 @@ option		COMPAT_AOUT	# a.out binaries are emulated
 
 maxusers	32		# estimated number of users
 
+# or use		root on nfs swap on nfs
 config		bsd	swap generic
 
 mainbus0 at root