[kernel/f15] Revert more f16 config changes that shouldn't be in f15.

[Dave Jones]

commit 2c860b02ae50f877c7fee6547fb817a8e47af2b7
Author: Dave Jones <davej at redhat.com>
Date:   Wed Feb 1 11:54:23 2012 -0500

    Revert more f16 config changes that shouldn't be in f15.

 config-generic     |   17 +++++++++--------
 config-x86-generic |    8 ++++----
 kernel.spec        |    3 +++
 3 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/config-generic b/config-generic
index 8b4d388..56ad067 100644
--- a/config-generic
+++ b/config-generic
@@ -174,7 +174,7 @@ CONFIG_INFINIBAND_QIB=m
 CONFIG_BINFMT_ELF=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=m
+CONFIG_BINFMT_MISC=y
 
 #
 # Device Drivers
@@ -363,7 +363,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_DEV_INITRD=y
@@ -3580,7 +3580,6 @@ CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
@@ -4107,12 +4106,14 @@ CONFIG_PM_RUNTIME=y
 # CONFIG_PM_OPP is not set
 
 CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEBUG=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
diff --git a/config-x86-generic b/config-x86-generic
index fec30ea..c57aa12 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -86,10 +86,10 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_CUSTOM_METHOD=m
 
-CONFIG_X86_ACPI_CPUFREQ=y
-CONFIG_X86_PCC_CPUFREQ=y
-CONFIG_X86_POWERNOW_K8=y
-CONFIG_X86_P4_CLOCKMOD=y
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_P4_CLOCKMOD=m
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 
 #
diff --git a/kernel.spec b/kernel.spec
index 168a3eb..cb00d00 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1964,6 +1964,9 @@ fi
 
 %changelog
 * Wed Feb 01 2012 Dave Jones <davej at redhat.com>
+- Revert more f16 config changes that shouldn't be in f15.
+
+* Wed Feb 01 2012 Dave Jones <davej at redhat.com>
 - Revert the f16 use-ext4-for-ext2/ext3 change.
 
 * Tue Jan 31 2012 Dennis Gilmore <dennis at ausil.us>