projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fb8c177)
x86: merge EARLY_PRINTK options
authorAdrian Bunk <bunk@kernel.org>
Mon, 29 Oct 2007 12:49:36 +0000 (13:49 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 29 Oct 2007 23:22:22 +0000 (00:22 +0100)
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 patch | blob | blame | history
arch/x86/Kconfig.x86_64 patch | blob | blame | history

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index fbd77b7dfd7f07b12249938287770d7a9c666632..6f32beb2c47fedfc087c58ebee6a2314e416531f 100644 (file)
--- 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 60ac22769a409f434667f2a58f72a807fd9c4e18..b45855c368a99d069dee777dcab801a03e1f5596 100644 (file)
--- 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