From d0241b393f838cb6809f862b5147b8af0a9a908a Mon Sep 17 00:00:00 2001
From: gmcgarry <gmcgarry@NetBSD.org>
Date: Mon, 5 Jun 2000 23:18:50 +0000
Subject: [PATCH] Replace references to xe with xi.  Clarify description to
 avoid confusion with the Xircom tlp-based cards.

---
 sys/arch/i386/conf/DR-EVIL                  | 4 ++--
 sys/arch/i386/conf/GENERIC                  | 6 +++---
 sys/arch/i386/conf/SWINGER                  | 6 +++---
 sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS | 6 +++---
 sys/dev/DEVNAMES                            | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys/arch/i386/conf/DR-EVIL b/sys/arch/i386/conf/DR-EVIL
index de8c2f2b8563..090139202299 100644
--- a/sys/arch/i386/conf/DR-EVIL
+++ b/sys/arch/i386/conf/DR-EVIL
@@ -1,4 +1,4 @@
-#	$NetBSD: DR-EVIL,v 1.17 2000/06/01 04:24:00 david Exp $
+#	$NetBSD: DR-EVIL,v 1.18 2000/06/05 23:18:51 gmcgarry Exp $
 #
 #	DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej@netbsd.org
 #
@@ -571,7 +571,7 @@ ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
 ray*	at pcmcia? function ?		# Raytheon RayLink (802.11)
 sm*	at pcmcia? function ?		# Megahertz Ethernet
 #wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
-xe*	at pcmcia? function ?		# Xircom PCMCIA cards
+xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet
 
 mhzc*	at pcmcia? function ?		# Megaherz combo cards
 com*	at mhzc?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index acc7be6208f2..0087dd7f43c4 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.348 2000/06/05 13:34:13 joda Exp $
+#	$NetBSD: GENERIC,v 1.349 2000/06/05 23:18:51 gmcgarry Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident 		"GENERIC-$Revision: 1.348 $"
+#ident 		"GENERIC-$Revision: 1.349 $"
 
 maxusers	32		# estimated number of users
 
@@ -577,7 +577,7 @@ ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
 ray*	at pcmcia? function ?		# Raytheon Raylink (802.11)
 sm*	at pcmcia? function ?		# Megahertz Ethernet
 wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
-#xe*	at pcmcia? function ?		# Xircom PCMCIA cards
+xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet
 
 mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
 com*	at mhzc?
diff --git a/sys/arch/i386/conf/SWINGER b/sys/arch/i386/conf/SWINGER
index 49ab335b5854..ff5a1ce31211 100644
--- a/sys/arch/i386/conf/SWINGER
+++ b/sys/arch/i386/conf/SWINGER
@@ -1,4 +1,4 @@
-#	$NetBSD: SWINGER,v 1.5 2000/06/01 04:24:01 david Exp $
+#	$NetBSD: SWINGER,v 1.6 2000/06/05 23:18:51 gmcgarry Exp $
 #	from NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp
 #
 #	SWINGER -- thorpej's Abit BP6+dual Celeron
@@ -6,7 +6,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident 		"SWINGER-$Revision: 1.5 $"
+#ident 		"SWINGER-$Revision: 1.6 $"
 
 maxusers	64		# estimated number of users
 
@@ -538,7 +538,7 @@ rtk*	at pci? dev ? function ?	# Realtek 8129/8139
 #ray*	at pcmcia? function ?		# Raytheon Raylink (802.11)
 #sm*	at pcmcia? function ?		# Megahertz Ethernet
 #wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
-#xe*	at pcmcia? function ?		# Xircom PCMCIA cards
+xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet
 
 #mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
 #com*	at mhzc?
diff --git a/sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS b/sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS
index 4956bd89c9a8..0abb5fbd8963 100644
--- a/sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS
+++ b/sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS
@@ -1,4 +1,4 @@
-#	$NetBSD: ZYGORTHIAN-SPACE-RAIDERS,v 1.29 2000/06/01 04:24:01 david Exp $
+#	$NetBSD: ZYGORTHIAN-SPACE-RAIDERS,v 1.30 2000/06/05 23:18:51 gmcgarry Exp $
 #	From: GENERIC,v 1.299 2000/02/03 20:31:42 dante Exp
 #
 #	GENERIC -- everything that's currently supported
@@ -6,7 +6,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident 		"GENERIC-$Revision: 1.29 $"
+#ident 		"GENERIC-$Revision: 1.30 $"
 
 maxusers	32		# estimated number of users
 
@@ -518,7 +518,7 @@ de*	at pci? dev ? function ?	# DEC 21x4x-based Ethernet
 ray*	at pcmcia? function ?		# Raytheon Raylink (802.11)
 #sm*	at pcmcia? function ?		# Megahertz Ethernet
 wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
-#xe*	at pcmcia? function ?		# Xircom PCMCIA cards
+#xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet
 
 #mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
 #com*	at mhzc?
diff --git a/sys/dev/DEVNAMES b/sys/dev/DEVNAMES
index 9d65d615c4ee..a097a712cb8d 100644
--- a/sys/dev/DEVNAMES
+++ b/sys/dev/DEVNAMES
@@ -1,4 +1,4 @@
-#	$NetBSD: DEVNAMES,v 1.5 2000/05/07 00:29:19 wiz Exp $
+#	$NetBSD: DEVNAMES,v 1.6 2000/06/05 23:18:50 gmcgarry Exp $
 #
 # This file contains all used device names and defined attributes in 
 # alphabetical order. New devices added to the system somewhere should first 
@@ -945,9 +945,9 @@ xd			MI
 xd			sun3
 xdc			MI		
 xdc			sun3
-xe			MI		
 xe			next68k
 xel			x68k
+xi			MI		
 xy			MI		
 xy			sun3
 xyc			MI