[src/netbsd-3-0]: src/sys/arch Pull up following revision(s) (requested by jn...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/04345f161caa
branches:  netbsd-3-0
changeset: 579415:04345f161caa
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun May 27 20:45:51 2007 +0000

description:
Pull up following revision(s) (requested by jnemeth in ticket #1778):
        sys/arch/hpcarm/conf/IPAQ: revision 1.50
        sys/arch/amd64/conf/GENERIC: revision 1.141
        sys/arch/amd64/conf/INSTALL: revision 1.68
        sys/arch/i386/conf/SWINGER: revision 1.90
PR/36234 - Joerg Niendorf -- xi -> xirc

diffstat:

 sys/arch/amd64/conf/GENERIC |  8 +++++---
 sys/arch/amd64/conf/INSTALL |  8 +++++---
 sys/arch/hpcarm/conf/IPAQ   |  6 ++++--
 sys/arch/i386/conf/SWINGER  |  8 +++++---
 4 files changed, 19 insertions(+), 11 deletions(-)

diffs (107 lines):

diff -r 38979d450428 -r 04345f161caa sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun May 27 20:40:28 2007 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun May 27 20:45:51 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.42.2.7 2005/09/15 23:33:43 snj Exp $
+# $NetBSD: GENERIC,v 1.42.2.7.2.1 2007/05/27 20:45:51 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.42.2.7 $"
+#ident                 "GENERIC-$Revision: 1.42.2.7.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -541,7 +541,9 @@
 # tr at pcmcia has problems with Cardbus bridges
 #tr*   at pcmcia? function ?           # TROPIC based Token-Ring
 #wi*   at pcmcia? function ?           # Lucent/Intersil WaveLan IEEE (802.11)
-#xi*   at pcmcia? function ?           # Xircom CreditCard Ethernet
+#xirc* at pcmcia? function ?           # Xircom CreditCard Ethernet
+#com*  at xirc?
+#xi*   at xirc?
 
 #mhzc* at pcmcia? function ?           # Megahertz Ethernet/Modem combo cards
 #com*  at mhzc?
diff -r 38979d450428 -r 04345f161caa sys/arch/amd64/conf/INSTALL
--- a/sys/arch/amd64/conf/INSTALL       Sun May 27 20:40:28 2007 +0000
+++ b/sys/arch/amd64/conf/INSTALL       Sun May 27 20:45:51 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.27.2.9 2005/11/28 20:08:49 riz Exp $
+# $NetBSD: INSTALL,v 1.27.2.9.2.1 2007/05/27 20:45:51 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include        "arch/amd64/conf/std.amd64"
 
-#ident                 "INSTALL-$Revision: 1.27.2.9 $"
+#ident                 "INSTALL-$Revision: 1.27.2.9.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -446,7 +446,9 @@
 # tr at pcmcia has problems with Cardbus bridges
 #tr*   at pcmcia? function ?           # TROPIC based Token-Ring
 #wi*   at pcmcia? function ?           # Lucent/Intersil WaveLan IEEE (802.11)
-#xi*   at pcmcia? function ?           # Xircom CreditCard Ethernet
+#xirc* at pcmcia? function ?           # Xircom CreditCard Ethernet
+#com*  at xirc?
+#xi*   at xirc?
 
 #mhzc* at pcmcia? function ?           # Megahertz Ethernet/Modem combo cards
 #com*  at mhzc?
diff -r 38979d450428 -r 04345f161caa sys/arch/hpcarm/conf/IPAQ
--- a/sys/arch/hpcarm/conf/IPAQ Sun May 27 20:40:28 2007 +0000
+++ b/sys/arch/hpcarm/conf/IPAQ Sun May 27 20:45:51 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: IPAQ,v 1.35.2.1 2005/07/18 21:13:50 riz Exp $
+#      $NetBSD: IPAQ,v 1.35.2.1.2.1 2007/05/27 20:45:51 bouyer Exp $
 #
 #      iPAQ H3600 -- Windows-CE based PDA
 #
@@ -170,7 +170,9 @@
 ray*   at pcmcia? function ?           # Raytheon Raylink (802.11)
 #sm*   at pcmcia? function ?           # Megahertz Ethernet
 wi*    at pcmcia? function ?           # Lucent WaveLan IEEE (802.11)
-#xi*   at pcmcia? function ?           # Xircom CreditCard Ethernet
+#xirc* at pcmcia? function ?           # Xircom CreditCard Ethernet
+#com*  at xirc?
+#xi*   at xirc?
 #mhzc* at pcmcia? function ?           # Megahertz Ethernet/Modem combo cards
 #com*  at mhzc?
 #sm*   at mhzc?
diff -r 38979d450428 -r 04345f161caa sys/arch/i386/conf/SWINGER
--- a/sys/arch/i386/conf/SWINGER        Sun May 27 20:40:28 2007 +0000
+++ b/sys/arch/i386/conf/SWINGER        Sun May 27 20:45:51 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: SWINGER,v 1.62.2.2 2005/07/18 21:13:29 riz Exp $
+#      $NetBSD: SWINGER,v 1.62.2.2.2.1 2007/05/27 20:45:52 bouyer Exp $
 #      from NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp
 #
 #      SWINGER -- thorpej's Abit BP6+dual Celeron
@@ -8,7 +8,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "SWINGER-$Revision: 1.62.2.2 $"
+#ident                 "SWINGER-$Revision: 1.62.2.2.2.1 $"
 
 maxusers       64              # estimated number of users
 
@@ -527,7 +527,9 @@
 #ray*  at pcmcia? function ?           # Raytheon Raylink (802.11)
 #sm*   at pcmcia? function ?           # Megahertz Ethernet
 #wi*   at pcmcia? function ?           # Lucent/Intersil WaveLan IEEE (802.11)
-#xi*   at pcmcia? function ?           # Xircom CreditCard Ethernet
+#xirc* at pcmcia? function ?           # Xircom CreditCard Ethernet
+#com*  at xirc?
+#xi*   at xirc?
 
 #mhzc* at pcmcia? function ?           # Megahertz Ethernet/Modem combo cards
 #com*  at mhzc?