From 8c805db6037a1f9e8a0e04713d7f545bd2fa4459 Mon Sep 17 00:00:00 2001 From: kato Date: Sat, 16 Oct 1999 13:11:49 +0000 Subject: Merge form sys/i386/conf/GENERIC revision 1.195. --- sys/pc98/conf/GENERIC | 2 +- sys/pc98/conf/GENERIC98 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/pc98') diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 7ac04d5..1240c26 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -195,7 +195,6 @@ device olpt0 at isa? port IO_LPT device ax0 # ASIX AX88140A device de0 # DEC/Intel DC21x4x (``Tulip'') device fxp0 # Intel EtherExpress PRO/100B (82557, 82558) -device mx0 # Macronix 98713/98715/98725 (``PMAC'') device pn0 # Lite-On 82c168/82c169 (``PNIC'') device tx0 # SMC 9432TX (83c170 ``EPIC'') device vx0 # 3Com 3c590, 3c595 (``Vortex'') @@ -204,6 +203,7 @@ device vx0 # 3Com 3c590, 3c595 (``Vortex'') controller miibus0 # MII bus support device al0 # ADMtek AL981/AN985 (``Comet''/``Centaur'') device dm0 # Davicom DM9100/DM9102 +device mx0 # Macronix 98713/98715/98725 (``PMAC'') device rl0 # RealTek 8129/8139 device sf0 # Adaptec AIC-6915 (``Starfire'') device ste0 # Sundance ST201 (D-Link DFE-550TX) diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98 index 7ac04d5..1240c26 100644 --- a/sys/pc98/conf/GENERIC98 +++ b/sys/pc98/conf/GENERIC98 @@ -195,7 +195,6 @@ device olpt0 at isa? port IO_LPT device ax0 # ASIX AX88140A device de0 # DEC/Intel DC21x4x (``Tulip'') device fxp0 # Intel EtherExpress PRO/100B (82557, 82558) -device mx0 # Macronix 98713/98715/98725 (``PMAC'') device pn0 # Lite-On 82c168/82c169 (``PNIC'') device tx0 # SMC 9432TX (83c170 ``EPIC'') device vx0 # 3Com 3c590, 3c595 (``Vortex'') @@ -204,6 +203,7 @@ device vx0 # 3Com 3c590, 3c595 (``Vortex'') controller miibus0 # MII bus support device al0 # ADMtek AL981/AN985 (``Comet''/``Centaur'') device dm0 # Davicom DM9100/DM9102 +device mx0 # Macronix 98713/98715/98725 (``PMAC'') device rl0 # RealTek 8129/8139 device sf0 # Adaptec AIC-6915 (``Starfire'') device ste0 # Sundance ST201 (D-Link DFE-550TX) -- cgit v1.1