remove some stuff to make this fit

1 files changed, 11 insertions, 133 deletions

diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index aa144f9f688..8ac55c7d8fd 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.110 2014/07/15 22:12:10 deraadt Exp $
+#	$OpenBSD: RAMDISKC,v 1.111 2014/09/24 12:45:58 deraadt Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -11,14 +11,8 @@ maxusers	4		# estimated number of users
 option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight saving time used by RTC
 
-#makeoptions	DEBUG="-g"	# compile full symbol table
-
 option		FFS		# UFS
-#option		EXT2FS		# Linux ext2fs
-
-#option		NFSCLIENT	# Network File System client
 
-#option		CD9660		# ISO 9660 + Rock Ridge file system
 option		MSDOSFS		# MS-DOS file system
 
 option		INET		# IP + ICMP + TCP + UDP
@@ -75,24 +69,24 @@ geodesc* at pci?		# Geode SC1100/SCx200 IAOC
 #glxpcib* at pci?		# AMD CS5536 PCI-ISA bridge
 
 # ISA PCMCIA controllers
-pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
-pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
-pcic2	at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000
+#pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
+#pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
+#pcic2	at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000
 
 # ISA Plug-and-Play PCMCIA controllers
 #pcic*	at isapnp?
 
 # PCI PCMCIA controllers
-pcic*	at pci? dev?
+#pcic*	at pci? dev?
 
 # PCMCIA bus support
-pcmcia*	at pcic?
+#pcmcia*	at pcic?
 
 # CardBus bus support (also see NOTE below)
-cardbus*	at cardslot?
-pcmcia*		at cardslot?
-cbb*		at pci?
-cardslot*	at cbb?
+#cardbus*	at cardslot?
+#pcmcia*		at cardslot?
+#cbb*		at pci?
+#cardslot*	at cbb?
 
 # USB Controllers
 uhci*	at pci?				# Universal Host Controller (Intel)
@@ -138,52 +132,7 @@ wsdisplay*	at pcdisplay?
 com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
 com1	at isa? port 0x2f8 irq 3
 com2	at isa? port 0x3e8 irq 5
-#com3	at isa? port 0x2e8 irq 9
-#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
-#com*	at ast?
-#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#com*	at boca?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps?
-#com*	at pcmcia?			# PCMCIA modem cards
-#com*	at isapnp?
-
-# 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 card
-#cy*	at pci?				# PCI cyclom card
-
-#lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
-#lpt1	at isa? port 0x278
-#lpt2	at isa? port 0x3bc
-
-#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
-#aha0	at isa? port 0x330	# Adaptec 154[02] SCSI controllers
-#aha1	at isa? port 0x334	# Adaptec 154[02] SCSI controllers
-#aha*	at isapnp?
-#ahb*	at eisa?		# Adaptec 174[024] SCSI controllers
-#ahc0	at isa?			# Adaptec 284x SCSI controllers
-#ahc*	at eisa?		# Adaptec 274x, aic7770 SCSI controllers
-#ahc*	at pci?			# Adaptec 2940 SCSI controllers
-#gdt*	at pci?			# ICP Vortex GDT RAID controllers
-#twe*	at pci?			# 3ware Escalade RAID controllers
-#aic0	at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
-#aic*	at isapnp?
-#aic*	at pcmcia?		# PCMCIA based aic SCSI controllers
-#siop*	at pci?			# NCR 538XX SCSI controllers(new)
-#adv*	at pci?			# AdvanSys 1200A/B and ULTRA SCSI
-#adw*	at pci?			# AdvanSys ULTRA WIDE SCSI
-#sea0	at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers
-#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
-#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 scsi?
 sd*	at scsibus?		# SCSI disk drives
@@ -193,7 +142,6 @@ sd*	at scsibus?		# SCSI disk drives
 #uk*	at scsibus?		# SCSI unknown devices
 
 fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
-#fdc1	at isa? port 0x370
 fd*	at fdc?
 
 # IDE controllers
@@ -201,8 +149,6 @@ pciide* at pci? flags 0x0000
 
 wdc0	at isa? port 0x1f0 irq 14 flags 0x00
 wdc1	at isa? port 0x170 irq 15 flags 0x00
-#wdc*	at pcmcia?
-#wdc*	at isapnp?
 
 # IDE hard drives
 wd*	at wdc? flags 0x0000
@@ -212,77 +158,9 @@ wd*	at pciide? flags 0x0000
 atapiscsi* at wdc?
 atapiscsi* at pciide?
 
-#we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet series
-#we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
-#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 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
-#ep*	at eisa?			# 3C579 ethernet
-#ep*	at isapnp?			# 3C509 PnP ethernet
-#le*	at isapnp?
-#de*	at pci?				# DC21X4X-based ethernet
-#fxp*	at pci?				# EtherExpress 10/100B ethernet
-#fxp*	at cardbus?			# Intel PRO/100 ethernet
-#ep*	at pci?				# 3C59x ethernet
-#ne*	at pci?				# NE2000-compat ethernet
-#ne*	at pcmcia?			# PCMCIA based NE2000
-#ep*	at pcmcia?			# PCMCIA based 3C5xx
-#sm*	at pcmcia?			# PCMCIA based sm
-#xe*	at pcmcia?			# Xircom ethernet
-#xl*	at pci?				# 3C9xx ethernet
-#xl*	at cardbus?			# 3C575 ethernet
-#rl*	at pci?				# RealTek 81[23]9 ethernet
-#rl*	at cardbus?			# RealTek 81[23]9 ethernet
-#epic*	at pci?				# SMC EPIC/100 ethernet
-#tl*	at pci?				# Compaq Thunderlan ethernet
-#vr*	at pci?				# VIA Rhine ethernet
-#wb*	at pci?				# Winbond W89C840F 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
 em*	at pci?				# Intel Pro/1000 ethernet
-#txp*	at pci?				# 3com 3CR990
-#nge*	at pci?				# NS DP83820/DP83821 GigE
-#bge*	at pci?				# Broadcom BCM570x (aka Tigon3)
 re*	at pci?				# Realtek 8169/8169S/8110S
-re*	at cardbus?			# Realtek 8169/8169S/8110S
-#stge*	at pci?				# Sundance TC9021 GigE
-#lge*	at pci?				# Level1 LXT1001 GigE
-#hme*	at pci?				# Sun Happy Meal
-#bce*	at pci?				# Broadcom BCM4401
-#vge*	at pci?				# VIA VT612x
-#nfe*	at pci?				# NVIDIA nForce Ethernet
-#pcn*	at pci?				# AMD PCnet-PCI Ethernet
-
-# Wireless network cards
 ath*	at pci?				# Atheros AR5k (802.11a/b/g)
-ath*	at cardbus?			# Atheros AR5k (802.11a/b/g)
-#atw*	at pci?				# ADMtek ADM8211 (802.11)
-#atw*	at cardbus?			# ADMtek ADM8211 (802.11)
-#wi*	at pci?				# WaveLAN IEEE 802.11DS
-#wi*	at pcmcia?			# WaveLAN IEEE 802.11DS
-#ipw*	at pci?				# Intel PRO/Wireless 2100
-#iwi*	at pci?				# Intel PRO/Wireless 2200BG/2915ABG
-#an*	at pcmcia?			# Aironet IEEE 802.11DS
-#cnw*	at pcmcia?			# Xircom Netwave
-#ral*	at pci?				# Ralink RT2500/RT2501/RT2600
-#ral*	at cardbus?			# Ralink RT2500/RT2501/RT2600
-#rtw*	at pci?				# Realtek 8180
-#rtw*	at cardbus?			# Realtek 8180
 
 # Media Independent Interface (mii) drivers
 #exphy*	at mii?				# 3Com internal PHYs