Merge tag 'kgdb-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...

[tomoyo/tomoyo-test1.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6e23037..70c668d 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -60,6 +60,7 @@ config X86
        select ARCH_HAS_ACPI_TABLE_UPGRADE      if ACPI
        select ARCH_HAS_DEBUG_VIRTUAL
        select ARCH_HAS_DEVMEM_IS_ALLOWED
+       select ARCH_HAS_EARLY_DEBUG             if KGDB
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_FAST_MULTIPLIER
        select ARCH_HAS_FILTER_PGPROT
@@ -597,7 +598,7 @@ config X86_INTEL_MID
        select I2C
        select DW_APB_TIMER
        select APB_TIMER
-       select INTEL_SCU_IPC
+       select INTEL_SCU_PCI
        select MFD_INTEL_MSIC
        ---help---
          Select to build a kernel capable of supporting Intel MID (Mobile