put some DS/FH cards on some boot media

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e6a3268..163879a 100644 (file)
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.170 2000/04/03 01:59:19 mickey Exp $
+#      $OpenBSD: GENERIC,v 1.171 2000/04/03 21:14:13 deraadt Exp $
 #      $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #      GENERIC -- everything that's currently supported
@@ -218,6 +218,7 @@ scsibus* at atapiscsi?
 # 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
@@ -231,7 +232,7 @@ ep* at isapnp?                              # 3C509 PnP ethernet
 ep*    at isa? port ? irq ?                    # 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
+#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 irq ?  # IBM TROPIC based Token-Ring
@@ -270,6 +271,7 @@ wx* at pci? dev ? function ?                # Intel Pro/1000 ethernet
 
 # Wireless network cards
 wi*    at pcmcia? function ?                   # WaveLAN IEEE 802.11DS
+#awi*  at pcmcia? function ?                   # Bay Networks IEEE 802.11FH
 an*    at pcmcia? function ?                   # Aironet IEEE 802.11DS
 #cnw*  at pcmcia? function ?                   # Xircom Netwave
 ray*   at pcmcia? function ?                   # Raylink Aviator2.4/Pro 802.11FH

diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 6e8dd80..96b8c68 100644 (file)
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISK,v 1.80 2000/03/27 23:19:23 deraadt Exp $
+#      $OpenBSD: RAMDISK,v 1.81 2000/04/03 21:14:13 deraadt Exp $
 #      from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #      Install kernels no longer support X.
@@ -201,7 +201,6 @@ ne* at pcmcia? function ?                   # PCMCIA based NE2000 cards
 ep*    at pcmcia? function ?                   # PCMCIA based 3c5xx cards
 sm*    at pcmcia? function ?                   # PCMCIA based sm cards
 xe*    at pcmcia? function ?                   # Xircom ethernet
-wi*    at pcmcia? function ?                   # WaveLAN IEEE 802.11
 #fpa*  at pci? dev ? function ?                # DEC DEFPA FDDI cards
 xl*    at pci? dev ? function ?                # 3C9xx ethernet cards
 rl*    at pci? dev ? function ?                # RealTek 81[23]9 ethernet
@@ -211,6 +210,13 @@ vr*        at pci? dev ? function ?                # VIA Rhine ethernet
 wb*    at pci? dev ? function ?                # Winbond W89C840F ethernet
 dc*    at pci? dev ? function ?                # 21143, "tulip" clone ethernet
 
+# Wireless network cards
+wi*    at pcmcia? function ?                   # WaveLAN IEEE 802.11DS
+#awi*  at pcmcia? function ?                   # Bay Networks IEEE 802.11FH
+#an*   at pcmcia? function ?                   # Aironet IEEE 802.11DS
+#cnw*  at pcmcia? function ?                   # Xircom Netwave
+#ray*  at pcmcia? function ?                   # Raylink Aviator2.4/Pro 802.11FH
+
 # Media Independent Interface (mii) drivers
 exphy* at mii? phy ?                           # 3Com internal PHYs
 inphy* at mii? phy ?                           # Intel 82555 PHYs

diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 1d4e881..9e6c701 100644 (file)
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISKB,v 1.13 2000/03/02 18:38:27 mickey Exp $
+#      $OpenBSD: RAMDISKB,v 1.14 2000/04/03 21:14:13 deraadt Exp $
 #      from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #      Install kernels no longer support X.
@@ -184,7 +184,7 @@ ep0 at isa? port ? irq ?                    # 3C509 ethernet cards
 ep*    at isa? port ? irq ?                    # 3C509 ethernet cards
 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
+#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
 ep0    at eisa? slot ?
@@ -202,7 +202,6 @@ ne* at pcmcia? function ?                   # PCMCIA based NE2000 cards
 ep*    at pcmcia? function ?                   # PCMCIA based 3c5xx cards
 sm*    at pcmcia? function ?                   # PCMCIA based sm cards
 xe*    at pcmcia? function ?                   # Xircom ethernet
-wi*    at pcmcia? function ?                   # WaveLAN IEEE 802.11
 #fpa*  at pci? dev ? function ?                # DEC DEFPA FDDI cards
 xl*    at pci? dev ? function ?                # 3C9xx ethernet cards
 rl*    at pci? dev ? function ?                # RealTek 81[23]9 ethernet
@@ -212,6 +211,12 @@ vr*        at pci? dev ? function ?                # VIA Rhine ethernet
 dc*    at pci? dev ? function ?                # 21143, "tulip" clone ethernet
 wb*    at pci? dev ? function ?                # Winbond W89C840F ethernet
 
+wi*    at pcmcia? function ?                   # WaveLAN IEEE 802.11
+#awi*  at pcmcia? function ?                   # Bay Networks IEEE 802.11FH
+#an*   at pcmcia? function ?                   # Aironet IEEE 802.11DS
+#cnw*  at pcmcia? function ?                   # Xircom Netwave
+#ray*  at pcmcia? function ?                   # Raylink Aviator2.4/Pro 802.11FH
+
 # Media Independent Interface (mii) drivers
 exphy* at mii? phy ?                           # 3Com internal PHYs
 inphy* at mii? phy ?                           # Intel 82555 PHYs

diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 6bc1d07..dbd0b5a 100644 (file)
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISK_CD,v 1.13 2000/03/27 23:19:23 deraadt Exp $
+#      $OpenBSD: RAMDISK_CD,v 1.14 2000/04/03 21:14:13 deraadt Exp $
 #      from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #      Install kernels no longer support X.
@@ -185,7 +185,7 @@ ep0 at isa? port ? irq ?                    # 3C509 ethernet cards
 ep*    at isa? port ? irq ?                    # 3C509 ethernet cards
 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
+#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
 ep0    at eisa? slot ?
@@ -204,7 +204,6 @@ ne* at pcmcia? function ?                   # PCMCIA based NE2000 cards
 ep*    at pcmcia? function ?                   # PCMCIA based 3c5xx cards
 sm*    at pcmcia? function ?                   # PCMCIA based sm cards
 xe*    at pcmcia? function ?                   # Xircom ethernet
-wi*    at pcmcia? function ?                   # WaveLAN IEEE 802.11
 fpa*   at pci? dev ? function ?                # DEC DEFPA FDDI cards
 xl*    at pci? dev ? function ?                # 3C9xx ethernet cards
 rl*    at pci? dev ? function ?                # RealTek 81[23]9 ethernet
@@ -215,6 +214,13 @@ dc*        at pci? dev ? function ?                # 21143, "tulip" clone ethernet
 wb*    at pci? dev ? function ?                # Winbond W89C840F ethernet
 ti*    at pci? dev ? function ?                # Alteon Tigon 1Gb ethernet
 
+# Wireless network cards
+wi*    at pcmcia? function ?                   # WaveLAN IEEE 802.11DS
+#awi*  at pcmcia? function ?                   # Bay Networks IEEE 802.11FH
+an*    at pcmcia? function ?                   # Aironet IEEE 802.11DS
+#cnw*  at pcmcia? function ?                   # Xircom Netwave
+ray*   at pcmcia? function ?                   # Raylink Aviator2.4/Pro 802.11FH
+
 # Media Independent Interface (mii) drivers
 exphy* at mii? phy ?                           # 3Com internal PHYs
 inphy* at mii? phy ?                           # Intel 82555 PHYs