better rearrangements

diff --git a/sys/arch/i386/conf/PETRA b/sys/arch/i386/conf/PETRA
index 9aaf37b..d1f89a4 100644 (file)
--- a/sys/arch/i386/conf/PETRA
+++ b/sys/arch/i386/conf/PETRA
@@ -1,4 +1,4 @@
-#      $OpenBSD: PETRA,v 1.20 2000/03/02 18:38:27 mickey Exp $
+#      $OpenBSD: PETRA,v 1.21 2000/03/27 23:19:23 deraadt Exp $
 #
 #      PETRA -- everything that's currently supported with certain
 #               changes for Applitron's fileserver petra, a 128 MB
@@ -10,7 +10,7 @@ machine               i386            # architecture, used by config; REQUIRED
 makeoptions    DEBUG="-g"      # make a bsd.gdb too
 
 #include "../../../conf/GENERIC"
-#      $OpenBSD: PETRA,v 1.20 2000/03/02 18:38:27 mickey Exp $
+#      $OpenBSD: PETRA,v 1.21 2000/03/27 23:19:23 deraadt Exp $
 #
 #      Machine-independent option; used by all architectures for their
 #      GENERIC kernel
@@ -331,7 +331,6 @@ 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
 ti*    at pci? dev ? function ?                # Alteon Tigon 1Gb ethernet
-ax*    at pci? dev ? function ?                # ASIX AX88140A ethernet
 al*    at pci? dev ? function ?                # ADMtek AL981/AN985 ethernet
 sf*    at pci? dev ? function ?                # Adaptec AIC-6915 ethernet
 skc*   at pci? dev ? function ?                # SysKonnect GEnesis 984x

diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 251d60a..6e8dd80 100644 (file)
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISK,v 1.79 2000/03/22 08:28:18 deraadt Exp $
+#      $OpenBSD: RAMDISK,v 1.80 2000/03/27 23:19:23 deraadt Exp $
 #      from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #      Install kernels no longer support X.
@@ -182,8 +182,8 @@ ne* at isapnp?                              # NE[12]000 PnP ethernet cards
 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
+#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
 ep0    at eisa? slot ?
@@ -200,7 +200,7 @@ ne* at pci? dev ? function ?                # NE2000-compat ethernet cards
 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
+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

diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index c78f7c0..6bc1d07 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.12 2000/03/02 18:38:27 mickey Exp $
+#      $OpenBSD: RAMDISK_CD,v 1.13 2000/03/27 23:19:23 deraadt Exp $
 #      from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #      Install kernels no longer support X.
@@ -214,7 +214,6 @@ 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
 ti*    at pci? dev ? function ?                # Alteon Tigon 1Gb ethernet
-ax*    at pci? dev ? function ?                # ASIX AX88140A ethernet
 
 # Media Independent Interface (mii) drivers
 exphy* at mii? phy ?                           # 3Com internal PHYs