Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep'

[karo-tx-linux.git] / arch / x86 / Kconfig.debug

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 67eec55093a5dc97634aea899c4be86ff9f18f00..783099f2ac72bc45c7196f71f344c81728521d95 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -120,14 +120,6 @@ config DEBUG_SET_MODULE_RONX
          against certain classes of kernel exploits.
          If in doubt, say "N".
 
-config DEBUG_NX_TEST
-       tristate "Testcase for the NX non-executable stack feature"
-       depends on DEBUG_KERNEL && m
-       ---help---
-         This option enables a testcase for the CPU NX capability
-         and the software setup of this feature.
-         If in doubt, say "N"
-
 config DOUBLEFAULT
        default y
        bool "Enable doublefault exception handler" if EXPERT