diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-10-29 08:49:36 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-29 19:22:22 -0400 |
commit | 1b8a8e95f9671ee449a794f87468738963393a72 (patch) | |
tree | 6c36208d0f11be130f8f90e3bbec27c6fcb4b9e9 /arch/x86 | |
parent | fb8c177fe04c81ef5abe603e01d51eafa02d903a (diff) |
x86: merge EARLY_PRINTK options
This patch merges the x86_64 EARLY_PRINTK option into the i386 one.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig.debug | 3 | ||||
-rw-r--r-- | arch/x86/Kconfig.x86_64 | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index fbd77b7dfd7f..6f32beb2c47f 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
@@ -6,9 +6,8 @@ config TRACE_IRQFLAGS_SUPPORT | |||
6 | source "lib/Kconfig.debug" | 6 | source "lib/Kconfig.debug" |
7 | 7 | ||
8 | config EARLY_PRINTK | 8 | config EARLY_PRINTK |
9 | bool "Early printk" if EMBEDDED && DEBUG_KERNEL | 9 | bool "Early printk" if EMBEDDED && DEBUG_KERNEL && X86_32 |
10 | default y | 10 | default y |
11 | depends on X86_32 | ||
12 | help | 11 | help |
13 | Write kernel log output directly into the VGA buffer or to a serial | 12 | Write kernel log output directly into the VGA buffer or to a serial |
14 | port. | 13 | port. |
diff --git a/arch/x86/Kconfig.x86_64 b/arch/x86/Kconfig.x86_64 index 60ac22769a40..b45855c368a9 100644 --- a/arch/x86/Kconfig.x86_64 +++ b/arch/x86/Kconfig.x86_64 | |||
@@ -97,10 +97,6 @@ config X86_CMPXCHG | |||
97 | bool | 97 | bool |
98 | default y | 98 | default y |
99 | 99 | ||
100 | config EARLY_PRINTK | ||
101 | bool | ||
102 | default y | ||
103 | |||
104 | config GENERIC_ISA_DMA | 100 | config GENERIC_ISA_DMA |
105 | bool | 101 | bool |
106 | default y | 102 | default y |