commit 1b8a8e95f9671ee449a794f87468738963393a72
author Adrian Bunk <bunk@kernel.org> Mon Oct 29 13:49:36 2007 +0100
committer Thomas Gleixner <tglx@linutronix.de> Tue Oct 30 00:22:22 2007 +0100
tree 6c36208d0f11be130f8f90e3bbec27c6fcb4b9e9
parent fb8c177fe04c81ef5abe603e01d51eafa02d903a

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>

arch/x86/Kconfig.debug

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 @@
 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.

arch/x86/Kconfig.x86_64

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 @@
 	bool
 	default y
 
-config EARLY_PRINTK
-	bool
-	default y
-
 config GENERIC_ISA_DMA
 	bool
 	default y