summaryrefslogtreecommitdiffstats
path: root/arch/i386/defconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-12-20 02:53:13 -0500
committerLen Brown <len.brown@intel.com>2006-12-20 02:53:13 -0500
commit9774f3384125912eb491ca77f77907324db3ed05 (patch)
tree0bdc7486e911dd9e955b41283ee19ac74521f7bd /arch/i386/defconfig
parent3be11c8f4f2fa194834c2e83540f34da442b8977 (diff)
parentf238085415c56618e042252894f2fcc971add645 (diff)
downloadkernel-crypto-9774f3384125912eb491ca77f77907324db3ed05.tar.gz
kernel-crypto-9774f3384125912eb491ca77f77907324db3ed05.tar.xz
kernel-crypto-9774f3384125912eb491ca77f77907324db3ed05.zip
merge linus into test branch
Diffstat (limited to 'arch/i386/defconfig')
-rw-r--r--arch/i386/defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 3265208e589..e075ff05c46 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -1493,8 +1493,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_LIST is not set
# CONFIG_FRAME_POINTER is not set
-CONFIG_UNWIND_INFO=y
-CONFIG_STACK_UNWIND=y
# CONFIG_FORCED_INLINING is not set
# CONFIG_HEADERS_CHECK is not set
# CONFIG_RCU_TORTURE_TEST is not set