Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a29df2353da577ce9e1d082e1001a15ad5986100..00fcf81f2c569b813a4b48f0800fc3ac72684d33 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1297,7 +1297,7 @@ config MICROCODE
          the Linux kernel.
 
          The preferred method to load microcode from a detached initrd is described
-         in Documentation/x86/early-microcode.txt. For that you need to enable
+         in Documentation/x86/microcode.txt. For that you need to enable
          CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the
          initrd for microcode blobs.
 
@@ -2009,6 +2009,9 @@ config KEXEC_FILE
          for kernel and initramfs as opposed to list of segments as
          accepted by previous system call.
 
+config ARCH_HAS_KEXEC_PURGATORY
+       def_bool KEXEC_FILE
+
 config KEXEC_VERIFY_SIG
        bool "Verify kernel signature during kexec_file_load() syscall"
        depends on KEXEC_FILE
@@ -2666,11 +2669,13 @@ config PCI_CNB20LE_QUIRK
 source "drivers/pci/Kconfig"
 
 config ISA_BUS
-       bool "ISA-style bus support on modern systems" if EXPERT
-       select ISA_BUS_API
+       bool "ISA bus support on modern systems" if EXPERT
        help
-         Enables ISA-style drivers on modern systems. This is necessary to
-         support PC/104 devices on X86_64 platforms.
+         Expose ISA bus device drivers and options available for selection and
+         configuration. Enable this option if your target machine has an ISA
+         bus. ISA is an older system, displaced by PCI and newer bus
+         architectures -- if your target machine is modern, it probably does
+         not have an ISA bus.
 
          If unsure, say N.