diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 04:24:31 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 04:24:31 -0500 |
| commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
| tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 /arch/x86/Kconfig.debug | |
| parent | a23ce6da9677d245aa0aadc99f4197030350ab54 (diff) | |
| parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/x86/Kconfig.debug')
| -rw-r--r-- | arch/x86/Kconfig.debug | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 45143bbcfe5..615e18810f4 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
| @@ -31,7 +31,7 @@ config X86_VERBOSE_BOOTUP | |||
| 31 | see errors. Disable this if you want silent bootup. | 31 | see errors. Disable this if you want silent bootup. |
| 32 | 32 | ||
| 33 | config EARLY_PRINTK | 33 | config EARLY_PRINTK |
| 34 | bool "Early printk" if EMBEDDED | 34 | bool "Early printk" if EXPERT |
| 35 | default y | 35 | default y |
| 36 | ---help--- | 36 | ---help--- |
| 37 | Write kernel log output directly into the VGA buffer or to a serial | 37 | Write kernel log output directly into the VGA buffer or to a serial |
| @@ -138,7 +138,7 @@ config DEBUG_NX_TEST | |||
| 138 | 138 | ||
| 139 | config DOUBLEFAULT | 139 | config DOUBLEFAULT |
| 140 | default y | 140 | default y |
| 141 | bool "Enable doublefault exception handler" if EMBEDDED | 141 | bool "Enable doublefault exception handler" if EXPERT |
| 142 | depends on X86_32 | 142 | depends on X86_32 |
| 143 | ---help--- | 143 | ---help--- |
| 144 | This option allows trapping of rare doublefault exceptions that | 144 | This option allows trapping of rare doublefault exceptions that |