summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2007-10-29 13:49:36 +0100
committerThomas Gleixner <tglx@linutronix.de>2007-10-30 00:22:22 +0100
commit1b8a8e95f9671ee449a794f87468738963393a72 (patch)
tree6c36208d0f11be130f8f90e3bbec27c6fcb4b9e9 /arch/x86
parentfb8c177fe04c81ef5abe603e01d51eafa02d903a (diff)
downloadop-kernel-dev-1b8a8e95f9671ee449a794f87468738963393a72.zip
op-kernel-dev-1b8a8e95f9671ee449a794f87468738963393a72.tar.gz
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.debug3
-rw-r--r--arch/x86/Kconfig.x86_644
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index fbd77b7..6f32beb2 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -6,9 +6,8 @@ config TRACE_IRQFLAGS_SUPPORT
source "lib/Kconfig.debug"
config EARLY_PRINTK
- bool "Early printk" if EMBEDDED && DEBUG_KERNEL
+ bool "Early printk" if EMBEDDED && DEBUG_KERNEL && X86_32
default y
- depends on X86_32
help
Write kernel log output directly into the VGA buffer or to a serial
port.
diff --git a/arch/x86/Kconfig.x86_64 b/arch/x86/Kconfig.x86_64
index 60ac227..b45855c 100644
--- a/arch/x86/Kconfig.x86_64
+++ b/arch/x86/Kconfig.x86_64
@@ -97,10 +97,6 @@ config X86_CMPXCHG
bool
default y
-config EARLY_PRINTK
- bool
- default y
-
config GENERIC_ISA_DMA
bool
default y
OpenPOWER on IntegriCloud