From 1b1bff673f381cd2b33c37bdb66499ef6da0a3f2 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 4 Jan 2010 21:33:10 +0000 Subject: [PATCH] Revert 201158. DEFAULTS isn't for this kind of thing.a --- sys/amd64/conf/DEFAULTS | 7 ------- sys/arm/conf/DEFAULTS | 7 ------- sys/i386/conf/DEFAULTS | 7 ------- sys/ia64/conf/DEFAULTS | 7 ------- sys/mips/conf/DEFAULTS | 7 ------- sys/pc98/conf/DEFAULTS | 7 ------- sys/powerpc/conf/DEFAULTS | 7 ------- sys/sparc64/conf/DEFAULTS | 7 ------- sys/sun4v/conf/DEFAULTS | 7 ------- 9 files changed, 63 deletions(-) diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index d6d39b6c769..1fb52b34e0c 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -20,10 +20,3 @@ options GEOM_PART_BSD options GEOM_PART_EBR options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR - -# 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 diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS index 4052ef3e500..591a0a14c8d 100644 --- a/sys/arm/conf/DEFAULTS +++ b/sys/arm/conf/DEFAULTS @@ -9,10 +9,3 @@ device mem options GEOM_PART_BSD options GEOM_PART_MBR - -# 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 diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index eb3ed17b81b..32e77e41979 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -28,10 +28,3 @@ options GEOM_PART_MBR # enable support for native hardware options NATIVE device atpic - -# 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 diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS index 58eaaf4b591..625ff90955c 100644 --- a/sys/ia64/conf/DEFAULTS +++ b/sys/ia64/conf/DEFAULTS @@ -17,10 +17,3 @@ device uart_ns8250 options GEOM_PART_BSD options GEOM_PART_GPT options GEOM_PART_MBR - -# 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 diff --git a/sys/mips/conf/DEFAULTS b/sys/mips/conf/DEFAULTS index 98337445e59..dc480cea27a 100644 --- a/sys/mips/conf/DEFAULTS +++ b/sys/mips/conf/DEFAULTS @@ -11,10 +11,3 @@ device uart_ns8250 options GEOM_PART_BSD options GEOM_PART_MBR - -# 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 diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS index bd0afd6ca80..0002cf0a30c 100644 --- a/sys/pc98/conf/DEFAULTS +++ b/sys/pc98/conf/DEFAULTS @@ -24,10 +24,3 @@ device uart_ns8250 # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_PC98 - -# 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 diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS index 30b54291c7d..7c981d147ba 100644 --- a/sys/powerpc/conf/DEFAULTS +++ b/sys/powerpc/conf/DEFAULTS @@ -14,10 +14,3 @@ device uart_z8530 options GEOM_PART_APM options GEOM_PART_MBR - -# 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 diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS index 32a79b105f8..38b2408bf44 100644 --- a/sys/sparc64/conf/DEFAULTS +++ b/sys/sparc64/conf/DEFAULTS @@ -19,10 +19,3 @@ options GEOM_PART_VTOC8 # 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 diff --git a/sys/sun4v/conf/DEFAULTS b/sys/sun4v/conf/DEFAULTS index a610d779a5f..610d65333a0 100644 --- a/sys/sun4v/conf/DEFAULTS +++ b/sys/sun4v/conf/DEFAULTS @@ -11,10 +11,3 @@ device mem # Memory and kernel memory devices # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_VTOC8 - -# 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