On Mon, 29 Oct 2007, Adrian Bunk wrote:

> This patch merges the x86_64 EARLY_PRINTK option into the i386 one.
> 
> Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>

Applied, thanks

         tglx
 
> ---
> 
>  arch/x86/Kconfig.debug  |    3 +--
>  arch/x86/Kconfig.x86_64 |    4 ----
>  2 files changed, 1 insertion(+), 6 deletions(-)
> 
> 9ac736d36f60cbfe4343f51b0f776e2068ceebe4 
> diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
> index a2fa37d..3de185a 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 e2542e5..04b8095 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
> 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to