svn commit: r201536 - in stable/7/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf

[Warner Losh]

Author: imp
Date: Mon Jan  4 21:45:37 2010
New Revision: 201536
URL: http://svn.freebsd.org/changeset/base/201536

Log:
  Revert 201164.  Truly optional items like this do not belong on DEFAULTS.

Modified:
  stable/7/sys/amd64/conf/DEFAULTS
  stable/7/sys/i386/conf/DEFAULTS
  stable/7/sys/ia64/conf/DEFAULTS
  stable/7/sys/pc98/conf/DEFAULTS
  stable/7/sys/powerpc/conf/DEFAULTS
  stable/7/sys/sparc64/conf/DEFAULTS
  stable/7/sys/sun4v/conf/DEFAULTS

Modified: stable/7/sys/amd64/conf/DEFAULTS
==============================================================================
--- stable/7/sys/amd64/conf/DEFAULTS	Mon Jan  4 21:33:10 2010	(r201535)
+++ stable/7/sys/amd64/conf/DEFAULTS	Mon Jan  4 21:45:37 2010	(r201536)
@@ -21,10 +21,3 @@ options 	GEOM_MBR
 
 # KSE support went from being default to a kernel option
 options 	KSE
-
-# Store the plain version of the configuration file in the kernel itself.
-# To store the entire file, including comments, put this in /etc/src.conf:
-# CONFIGARGS=	-C
-# See config(8) for more details.
-#
-options 	INCLUDE_CONFIG_FILE	# Include this file in kernel

Modified: stable/7/sys/i386/conf/DEFAULTS
==============================================================================
--- stable/7/sys/i386/conf/DEFAULTS	Mon Jan  4 21:33:10 2010	(r201535)
+++ stable/7/sys/i386/conf/DEFAULTS	Mon Jan  4 21:45:37 2010	(r201536)
@@ -25,10 +25,3 @@ options 	GEOM_MBR
 
 # KSE support went from being default to a kernel option
 options 	KSE
- 
-# Store the plain version of the configuration file in the kernel itself.
-# To store the entire file, including comments, put this in /etc/src.conf:
-# CONFIGARGS=	-C
-# See config(8) for more details.
-#
-options 	INCLUDE_CONFIG_FILE	# Include this file in kernel

Modified: stable/7/sys/ia64/conf/DEFAULTS
==============================================================================
--- stable/7/sys/ia64/conf/DEFAULTS	Mon Jan  4 21:33:10 2010	(r201535)
+++ stable/7/sys/ia64/conf/DEFAULTS	Mon Jan  4 21:45:37 2010	(r201536)
@@ -20,10 +20,3 @@ options 	GEOM_PART_MBR
 
 # KSE support went from being default to a kernel option
 options 	KSE
- 
-# Store the plain version of the configuration file in the kernel itself.
-# To store the entire file, including comments, put this in /etc/src.conf:
-# CONFIGARGS=	-C
-# See config(8) for more details.
-#
-options 	INCLUDE_CONFIG_FILE	# Include this file in kernel

Modified: stable/7/sys/pc98/conf/DEFAULTS
==============================================================================
--- stable/7/sys/pc98/conf/DEFAULTS	Mon Jan  4 21:33:10 2010	(r201535)
+++ stable/7/sys/pc98/conf/DEFAULTS	Mon Jan  4 21:45:37 2010	(r201536)
@@ -27,10 +27,3 @@ options 	GEOM_PC98
 
 # KSE support went from being default to a kernel option
 options 	KSE
- 
-# Store the plain version of the configuration file in the kernel itself.
-# To store the entire file, including comments, put this in /etc/src.conf:
-# CONFIGARGS=	-C
-# See config(8) for more details.
-#
-options 	INCLUDE_CONFIG_FILE	# Include this file in kernel

Modified: stable/7/sys/powerpc/conf/DEFAULTS
==============================================================================
--- stable/7/sys/powerpc/conf/DEFAULTS	Mon Jan  4 21:33:10 2010	(r201535)
+++ stable/7/sys/powerpc/conf/DEFAULTS	Mon Jan  4 21:45:37 2010	(r201536)
@@ -17,10 +17,3 @@ options 	GEOM_PART_MBR
 
 # KSE support went from being default to a kernel option
 options 	KSE
- 
-# Store the plain version of the configuration file in the kernel itself.
-# To store the entire file, including comments, put this in /etc/src.conf:
-# CONFIGARGS=	-C
-# See config(8) for more details.
-#
-options 	INCLUDE_CONFIG_FILE	# Include this file in kernel

Modified: stable/7/sys/sparc64/conf/DEFAULTS
==============================================================================
--- stable/7/sys/sparc64/conf/DEFAULTS	Mon Jan  4 21:33:10 2010	(r201535)
+++ stable/7/sys/sparc64/conf/DEFAULTS	Mon Jan  4 21:45:37 2010	(r201536)
@@ -22,10 +22,3 @@ options 	GEOM_SUNLABEL
 
 # Let sunkbd emulate an AT keyboard by default.
 options 	SUNKBD_EMULATE_ATKBD
- 
-# Store the plain version of the configuration file in the kernel itself.
-# To store the entire file, including comments, put this in /etc/src.conf:
-# CONFIGARGS=	-C
-# See config(8) for more details.
-#
-options 	INCLUDE_CONFIG_FILE	# Include this file in kernel

Modified: stable/7/sys/sun4v/conf/DEFAULTS
==============================================================================
--- stable/7/sys/sun4v/conf/DEFAULTS	Mon Jan  4 21:33:10 2010	(r201535)
+++ stable/7/sys/sun4v/conf/DEFAULTS	Mon Jan  4 21:45:37 2010	(r201536)
@@ -12,10 +12,3 @@ device		genclock	# Generic clock interfa
 # Default partitioning schemes
 options 	GEOM_BSD
 options 	GEOM_SUNLABEL
- 
-# Store the plain version of the configuration file in the kernel itself.
-# To store the entire file, including comments, put this in /etc/src.conf:
-# CONFIGARGS=	-C
-# See config(8) for more details.
-#
-options 	INCLUDE_CONFIG_FILE	# Include this file in kernel