From 1918ca1e5bcf4e0076531b6e06dc66ad461b580e Mon Sep 17 00:00:00 2001
From: augustss <augustss@NetBSD.org>
Date: Sun, 1 Mar 1998 20:45:26 +0000
Subject: [PATCH] Change ie[01] to ef, ai, and ix so that these kernels can be
 used again.

---
 sys/arch/i386/conf/DISKLESS      | 7 ++++---
 sys/arch/i386/conf/INSTALL       | 7 ++++---
 sys/arch/i386/conf/INSTALL_SMALL | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index 5879419127d8..25b29d39cfb9 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$NetBSD: DISKLESS,v 1.59 1998/02/06 11:20:29 mrg Exp $
+#	$NetBSD: DISKLESS,v 1.60 1998/03/01 20:45:26 augustss Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
 # This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -211,8 +211,9 @@ ed2	at isa? port 0x300 iomem 0xcc000 irq 10
 el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
 ep0	at isa? port ? irq ?			# 3C509 ethernet cards
 #ep*	at isapnp?
-ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
-ie1	at isa? port 0x300 irq 10		# EtherExpress
+ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3C507
+ai0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN
+ix0	at isa? port 0x300 irq 10		# EtherExpress/16
 #le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
 lc0	at isa? port ? iomem ? irq ?		# DEC EtherWORKS III (LEMAC)
 ne0	at isa? port 0x280 irq 9		# NE[12]000 ethernet cards
diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL
index 92c8abac098c..a443b2b4a9c4 100644
--- a/sys/arch/i386/conf/INSTALL
+++ b/sys/arch/i386/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.76 1998/02/06 11:20:35 mrg Exp $
+#	$NetBSD: INSTALL,v 1.77 1998/03/01 20:45:26 augustss Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -354,8 +354,9 @@ eg0	at isa? port 0x280 irq 9		# 3C505 ethernet cards
 el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
 ep0	at isa? port ? irq ?			# 3C509 ethernet cards
 fe0	at isa? port 0x2a0 irq ?		# AT1700
-ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
-ie1	at isa? port 0x300 irq 10		# EtherExpress
+ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3C507
+ai0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN
+ix0	at isa? port 0x300 irq 10		# EtherExpress/16
 iy0	at isa? port 0x360 irq ?		# EtherExpress PRO 10 ISA
 lc0	at isa? port 0x320 iomem ? irq ?	# DEC EtherWORKS III (LEMAC)
 #le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
diff --git a/sys/arch/i386/conf/INSTALL_SMALL b/sys/arch/i386/conf/INSTALL_SMALL
index 4ffbd95ee3cf..f5b3abfe1a25 100644
--- a/sys/arch/i386/conf/INSTALL_SMALL
+++ b/sys/arch/i386/conf/INSTALL_SMALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_SMALL,v 1.14 1998/02/06 11:20:37 mrg Exp $
+#	$NetBSD: INSTALL_SMALL,v 1.15 1998/03/01 20:45:26 augustss Exp $
 #
 #	INSTALL_SMALL - Small Installation kernel.
 #
@@ -355,8 +355,9 @@ eg0	at isa? port 0x280 irq 9		# 3C505 ethernet cards
 el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
 ep0	at isa? port ? irq ?			# 3C509 ethernet cards
 fe0	at isa? port 0x2a0 irq ?		# AT1700
-ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
-ie1	at isa? port 0x300 irq 10		# EtherExpress
+ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3C507
+ai0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN
+ix0	at isa? port 0x300 irq 10		# EtherExpress/16
 iy0	at isa? port 0x360 irq ?		# EtherExpress PRO 10 ISA
 lc0	at isa? port 0x320 iomem ? irq ?	# DEC EtherWORKS III (LEMAC)
 #le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA