summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-07-11 17:03:10 -0400
committerDave Jones <davej@redhat.com>2011-07-11 17:03:10 -0400
commitd74412cfc27a4a8ec811064359210e7bf064077d (patch)
tree8e3c7ab7705066c44ec591fd8e21b44f80a1a8a8
parente04b212cc5b43cda75aee2b6efa65c9234138713 (diff)
downloadkernel-d74412cfc27a4a8ec811064359210e7bf064077d.tar.gz
kernel-d74412cfc27a4a8ec811064359210e7bf064077d.tar.xz
kernel-d74412cfc27a4a8ec811064359210e7bf064077d.zip
Change BINFMT_MISC to be modular. (rhbz 695415)
-rw-r--r--config-generic2
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index ae0bd8226..755c7c621 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=y
+CONFIG_BINFMT_MISC=m
#
# Device Drivers
diff --git a/kernel.spec b/kernel.spec
index ba11f1a7e..fc69268b9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1876,6 +1876,9 @@ fi
# and build.
%changelog
+* Mon Jul 11 2011 Dave Jones <davej@redhat.com>
+- Change BINFMT_MISC to be modular. (rhbz 695415)
+
* Sun Jul 10 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc6.git6.1
- Linux 3.0-rc6-git6
- iwlagn-fix-dma-direction.patch: drop.