disable a bunch of old devices (mostly ISA, or stuff people are unlikely

to use on a laptop)
enable a bunch of newer devices.  For instance, a whole whack of new
gigabit & wireless cards -- pci and cardbus

1 files changed, 25 insertions, 20 deletions

diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 4153aaefd17..6c3adf69254 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.49 2005/03/16 19:50:59 deraadt Exp $
+#	$OpenBSD: RAMDISKC,v 1.50 2005/03/18 19:10:33 deraadt Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -112,7 +112,7 @@ aue*	at uhub?		# ADMtek AN986 Pegasus Ethernet
 #udav*	at uhub?		# Davicom DM9601 based Ethernet
 #url*	at uhub?		# Realtek RTL8150L based adapters
 wi*	at uhub?		# WaveLAN IEEE 802.11DS
-#ral	at uhub?		# Ralink
+#ural	at uhub?		# Ralink
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
@@ -138,7 +138,7 @@ pccom2	at isa? port 0x3e8 irq 5
 #rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
 #pccom*	at rtfps?
 pccom*	at pcmcia?			# PCMCIA modem cards
-pccom*	at isapnp?
+#pccom*	at isapnp?
 
 # option for using CD1400 handshaking for incoming data
 # requires a special cable that exchanges the RTS and DTR lines
@@ -172,10 +172,10 @@ pccom*	at isapnp?
 #scsibus* at pci?
 #isp*	at pci?			# Qlogic ISP [12]0x0 SCSI/FibreChannel
 #scsibus* at isp?
-aic0	at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
+#aic0	at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
 #aic*	at isapnp?
-aic*	at pcmcia?		# PCMCIA based aic SCSI controllers
-scsibus* at aic?
+#aic*	at pcmcia?		# PCMCIA based aic SCSI controllers
+#scsibus* at aic?
 #ncr*	at pci?			# NCR 538XX SCSI controllers(old)
 #scsibus* at ncr?
 #siop*	at pci?			# NCR 538XX SCSI controllers(new)
@@ -195,7 +195,7 @@ scsibus* at aic?
 #scsibus* at wds?
 
 sd*	at scsibus?		# SCSI disk drives
-st*	at scsibus?		# SCSI tape drives
+#st*	at scsibus?		# SCSI tape drives
 cd*	at scsibus?		# SCSI CD-ROM drives
 #ch*	at scsibus?		# SCSI autochangers
 #uk*	at scsibus?		# SCSI unknown devices
@@ -212,7 +212,7 @@ 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?
+#wdc*	at isapnp?
 
 # IDE hard drives
 wd*	at wdc? flags 0x0000
@@ -225,14 +225,14 @@ scsibus* at atapiscsi?
 
 #wt0	at isa? port 0x308 irq 5 drq 1	# Archive/Wangtek QIC tapes
 
-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
+#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
@@ -240,7 +240,7 @@ 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
+#le0	at isa? port 0x360 irq 15 drq 6	# IsoLan, NE2100, and DEPCA
 #ex0	at isa? port 0x320 irq 5	# Intel EtherExpress PRO/10
 #ep0	at eisa?
 #ep*	at eisa?			# 3C579 ethernet
@@ -277,6 +277,7 @@ em*	at pci?				# Intel Pro/1000 ethernet
 #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
@@ -284,10 +285,14 @@ re*	at pci?				# Realtek 8169/8169S/8110S
 vge*	at pci? 			# VIA VT612x
 
 # Wireless network cards
-#ath*	at pci?				# Atheros AR5k (802.11a/b/g)
-#ath*	at cardbus?			# Atheros AR5k (802.11a/b/g)
-wi*	at pci?				# WaveLAN IEEE 802.11DS
+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
 #awi*	at pcmcia?			# Bay Networks IEEE 802.11FH
 #an*	at pcmcia?			# Aironet IEEE 802.11DS
 #cnw*	at pcmcia?			# Xircom Netwave