From 99dbd1df7f4b44bc6a17fc2696ffc376621a19d0 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 2 Sep 2012 22:21:29 -0700 Subject: [PATCH] --- yaml --- r: 323963 b: refs/heads/master c: c206b9dcb1fc41b104db43e98f9b83a8c0c559ae h: refs/heads/master i: 323961: 2487e97383522bf58d69f1396f5c040d2d6cea1d 323959: cc3b697b621830391586df9e22521eaf00b9eb67 v: v3 --- [refs] | 2 +- trunk/arch/x86/configs/i386_defconfig | 1 - trunk/arch/x86/configs/x86_64_defconfig | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index adce6047f88e..bc0a73950888 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be2f328d8616c81b86e4013974608776c317bbeb +refs/heads/master: c206b9dcb1fc41b104db43e98f9b83a8c0c559ae diff --git a/trunk/arch/x86/configs/i386_defconfig b/trunk/arch/x86/configs/i386_defconfig index a6533a292229..5598547281a7 100644 --- a/trunk/arch/x86/configs/i386_defconfig +++ b/trunk/arch/x86/configs/i386_defconfig @@ -298,7 +298,6 @@ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_EARLY_PRINTK_DBGP=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_RODATA_TEST is not set -CONFIG_DEBUG_NX_TEST=m CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_OPTIMIZE_INLINING=y CONFIG_KEYS_DEBUG_PROC_KEYS=y diff --git a/trunk/arch/x86/configs/x86_64_defconfig b/trunk/arch/x86/configs/x86_64_defconfig index 18f3cc47ab8f..671524d0f6c0 100644 --- a/trunk/arch/x86/configs/x86_64_defconfig +++ b/trunk/arch/x86/configs/x86_64_defconfig @@ -297,7 +297,6 @@ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_EARLY_PRINTK_DBGP=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_RODATA_TEST is not set -CONFIG_DEBUG_NX_TEST=m CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_OPTIMIZE_INLINING=y CONFIG_KEYS_DEBUG_PROC_KEYS=y