summary refs log tree commit diff
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorBenjamin Gilbert <benjamin.gilbert@coreos.com>2018-01-23 18:06:32 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-25 12:46:30 +0100
commitc508c46e6e3aef7762a214a09cf826711f1e2772 (patch)
tree85ee28d9542be743c00273b4c254f22f932c7234 /arch/x86/Kconfig
parent7f55c733b6607d6bfc16057641f18280e587cca8 (diff)
downloadlinux-c508c46e6e3aef7762a214a09cf826711f1e2772.tar.gz
firmware: Fix up docs referring to FIRMWARE_IN_KERNEL
We've removed the option, so stop talking about it.

Signed-off-by: Benjamin Gilbert <benjamin.gilbert@coreos.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d4fc98c50378..e43b0063d864 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1242,9 +1242,9 @@ config MICROCODE
 	  CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the
 	  initrd for microcode blobs.
 
-	  In addition, you can build-in the microcode into the kernel. For that you
-	  need to enable FIRMWARE_IN_KERNEL and add the vendor-supplied microcode
-	  to the CONFIG_EXTRA_FIRMWARE config option.
+	  In addition, you can build the microcode into the kernel. For that you
+	  need to add the vendor-supplied microcode to the CONFIG_EXTRA_FIRMWARE
+	  config option.
 
 config MICROCODE_INTEL
 	bool "Intel microcode loading support"