Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-3-0]: src/sys/arch Pull up following revision(s) (requested by ad...
details: https://anonhg.NetBSD.org/src/rev/f863b38c6ba7
branches: netbsd-3-0
changeset: 579445:f863b38c6ba7
user: ghen <ghen%NetBSD.org@localhost>
date: Tue Aug 28 13:52:47 2007 +0000
description:
Pull up following revision(s) (requested by adrianp in ticket #1826):
sys/arch/hp300/conf/GENERIC: revision 1.141 via patch
sys/arch/amd64/conf/GENERIC: revision 1.154 via patch
sys/arch/cats/conf/GENERIC: revision 1.116 via patch
sys/arch/arc/conf/GENERIC: revision 1.148 via patch
sys/arch/acorn32/conf/GENERIC: revision 1.80 via patch
sys/arch/sparc/conf/GENERIC: revision 1.200 via patch
sys/arch/sparc64/conf/GENERIC: revision 1.88 via patch
sys/arch/atari/conf/GENERIC.in: revision 1.68 via patch
sys/arch/amiga/conf/GENERIC: revision 1.248 via patch
sys/arch/i386/conf/GENERIC.MPACPI: patch
sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.239 via patch
sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.66 via patch
sys/arch/i386/conf/GENERIC: revision 1.840 via patch
sys/arch/amiga/conf/GENERIC.in: revision 1.61 via patch
sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.68 via patch
sys/arch/mac68k/conf/GENERIC: revision 1.182 via patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@
diffstat:
sys/arch/acorn32/conf/GENERIC | 6 +++---
sys/arch/amd64/conf/GENERIC | 6 +++---
sys/arch/amiga/conf/GENERIC | 6 +++---
sys/arch/amiga/conf/GENERIC.in | 6 +++---
sys/arch/arc/conf/GENERIC | 6 +++---
sys/arch/atari/conf/GENERIC.in | 4 ++--
sys/arch/cats/conf/GENERIC | 4 ++--
sys/arch/hp300/conf/GENERIC | 6 +++---
sys/arch/i386/conf/GENERIC | 6 +++---
sys/arch/i386/conf/GENERIC.MPACPI | 6 +++---
sys/arch/i386/conf/GENERIC_LAPTOP | 6 +++---
sys/arch/mac68k/conf/GENERIC | 6 +++---
sys/arch/sgimips/conf/GENERIC32_IP2x | 6 +++---
sys/arch/sgimips/conf/GENERIC32_IP3x | 6 +++---
sys/arch/sparc/conf/GENERIC | 6 +++---
sys/arch/sparc64/conf/GENERIC32 | 8 ++++----
16 files changed, 47 insertions(+), 47 deletions(-)
diffs (truncated from 415 to 300 lines):
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/acorn32/conf/GENERIC Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.52.4.3 2005/11/05 00:39:47 tron Exp $
+# $NetBSD: GENERIC,v 1.52.4.3.2.1 2007/08/28 13:52:49 ghen Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.52.4.3 $"
+#ident "GENERIC-$Revision: 1.52.4.3.2.1 $"
# estimated number of users
maxusers 32
@@ -86,7 +86,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/amd64/conf/GENERIC Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.42.2.7.2.1 2007/05/27 20:45:51 bouyer Exp $
+# $NetBSD: GENERIC,v 1.42.2.7.2.2 2007/08/28 13:52:47 ghen 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.2.1 $"
+#ident "GENERIC-$Revision: 1.42.2.7.2.2 $"
maxusers 32 # estimated number of users
@@ -142,7 +142,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/amiga/conf/GENERIC Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.214.2.3 2005/11/05 00:42:33 tron Exp $
+# $NetBSD: GENERIC,v 1.214.2.3.2.1 2007/08/28 13:52:50 ghen Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.214.2.3 $"
+#ident "GENERIC-$Revision: 1.214.2.3.2.1 $"
maxusers 8
@@ -72,7 +72,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.34.2.3 2005/11/05 00:39:47 tron Exp $
+# $NetBSD: GENERIC.in,v 1.34.2.3.2.1 2007/08/28 13:52:50 ghen Exp $
#
# GENERIC machine description file
#
@@ -56,7 +56,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.34.2.3 $"
+#ident "GENERIC-$Revision: 1.34.2.3.2.1 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -110,7 +110,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/arc/conf/GENERIC
--- a/sys/arch/arc/conf/GENERIC Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/arc/conf/GENERIC Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.113.4.4 2005/11/05 00:39:48 tron Exp $
+# $NetBSD: GENERIC,v 1.113.4.4.2.1 2007/08/28 13:52:48 ghen Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.113.4.4 $"
+#ident "GENERIC-$Revision: 1.113.4.4.2.1 $"
maxusers 32 # estimated number of users
@@ -137,7 +137,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI networking
+#options ISO,TPIP # OSI networking
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/atari/conf/GENERIC.in
--- a/sys/arch/atari/conf/GENERIC.in Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/atari/conf/GENERIC.in Tue Aug 28 13:52:47 2007 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.in,v 1.47.2.3 2005/11/05 00:39:48 tron Exp $
+# $NetBSD: GENERIC.in,v 1.47.2.3.2.1 2007/08/28 13:52:50 ghen Exp $
#
# Generic atari
#
@@ -63,7 +63,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
#ifndef NO_PHYS_NETWORK
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/cats/conf/GENERIC Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.77.2.5 2005/11/05 00:39:47 tron Exp $
+# $NetBSD: GENERIC,v 1.77.2.5.2.1 2007/08/28 13:52:48 ghen Exp $
#
# GENERIC machine description file
#
@@ -92,7 +92,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/hp300/conf/GENERIC
--- a/sys/arch/hp300/conf/GENERIC Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/hp300/conf/GENERIC Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.113.4.3 2005/11/05 00:39:47 tron Exp $
+# $NetBSD: GENERIC,v 1.113.4.3.2.1 2007/08/28 13:52:47 ghen Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.113.4.3 $"
+#ident "GENERIC-$Revision: 1.113.4.3.2.1 $"
maxusers 32 # estimated number of users
@@ -137,7 +137,7 @@
options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/i386/conf/GENERIC Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.661.2.8 2005/10/28 20:12:42 jmc Exp $
+# $NetBSD: GENERIC,v 1.661.2.8.2.1 2007/08/28 13:52:51 ghen Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.661.2.8 $"
+#ident "GENERIC-$Revision: 1.661.2.8.2.1 $"
maxusers 32 # estimated number of users
@@ -183,7 +183,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/i386/conf/GENERIC.MPACPI
--- a/sys/arch/i386/conf/GENERIC.MPACPI Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/i386/conf/GENERIC.MPACPI Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.MPACPI,v 1.21.4.5 2005/09/15 23:33:43 snj Exp $
+# $NetBSD: GENERIC.MPACPI,v 1.21.4.5.2.1 2007/08/28 13:52:52 ghen Exp $
#
# GENERIC.MPACPI -- Generic, plus ACPI Multiprocessor support
#
@@ -8,7 +8,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.21.4.5 $"
+#ident "GENERIC-$Revision: 1.21.4.5.2.1 $"
maxusers 32 # estimated number of users
@@ -172,7 +172,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_LAPTOP,v 1.135.2.5 2005/10/15 21:36:52 riz Exp $
+# $NetBSD: GENERIC_LAPTOP,v 1.135.2.5.2.1 2007/08/28 13:52:51 ghen Exp $
# From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
#
# GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -8,7 +8,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.135.2.5 $"
+#ident "GENERIC-$Revision: 1.135.2.5.2.1 $"
maxusers 32 # estimated number of users
@@ -151,7 +151,7 @@
#options PIM # Protocol Independent Multicast
options NS # XNS
#options NSIP # XNS tunneling over IP
-options ISO,TPIP # OSI
+#options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
diff -r ca984c63b120 -r f863b38c6ba7 sys/arch/mac68k/conf/GENERIC
--- a/sys/arch/mac68k/conf/GENERIC Tue Aug 28 13:32:54 2007 +0000
+++ b/sys/arch/mac68k/conf/GENERIC Tue Aug 28 13:52:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.156.2.2 2005/08/14 21:14:34 riz Exp $
+# $NetBSD: GENERIC,v 1.156.2.2.2.1 2007/08/28 13:52:54 ghen Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.156.2.2 $"
+#ident "GENERIC-$Revision: 1.156.2.2.2.1 $"
maxusers 16 # estimated number of users
@@ -140,7 +140,7 @@
#options PIM # Protocol Independent Multicast
Home |
Main Index |
Thread Index |
Old Index