diff --git a/[refs] b/[refs] index 56a57dd0f952..cc0a32197b8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0ec9483dbe8f534e0f3ef413f9eba9a5ff78050 +refs/heads/master: 49793b0341a802cf5ee4179e837a2eb20f12c9fe diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index a783fe7759ca..12b433aaaa60 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -35,7 +35,7 @@ config X86 select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACE_MCOUNT_TEST select HAVE_KVM - select HAVE_ARCH_KGDB if !X86_VOYAGER + select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK select HAVE_GENERIC_DMA_COHERENT if X86_32 select HAVE_EFFICIENT_UNALIGNED_ACCESS