* Benjamin Gilbert <benjamin.gilbert@xxxxxxxxxx> wrote: > We've removed the option, so stop talking about it. > > Signed-off-by: Benjamin Gilbert <benjamin.gilbert@xxxxxxxxxx> > Cc: Borislav Petkov <bp@xxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: Ingo Molnar <mingo@xxxxxxxxxx> > Cc: H. Peter Anvin <hpa@xxxxxxxxx> > --- > Documentation/driver-api/firmware/built-in-fw.rst | 7 +------ > Documentation/x86/microcode.txt | 5 ++--- > arch/x86/Kconfig | 6 +++--- > 3 files changed, 6 insertions(+), 12 deletions(-) > > diff --git a/Documentation/driver-api/firmware/built-in-fw.rst b/Documentation/driver-api/firmware/built-in-fw.rst > index 7300e66857f8..396cdf591ac5 100644 > --- a/Documentation/driver-api/firmware/built-in-fw.rst > +++ b/Documentation/driver-api/firmware/built-in-fw.rst > @@ -11,13 +11,8 @@ options: > * CONFIG_EXTRA_FIRMWARE > * CONFIG_EXTRA_FIRMWARE_DIR > > -This should not be confused with CONFIG_FIRMWARE_IN_KERNEL, this is for drivers > -which enables firmware to be built as part of the kernel build process. This > -option, CONFIG_FIRMWARE_IN_KERNEL, will build all firmware for all drivers > -enabled which ship its firmware inside the Linux kernel source tree. > - > There are a few reasons why you might want to consider building your firmware > -into the kernel with CONFIG_EXTRA_FIRMWARE though: > +into the kernel with CONFIG_EXTRA_FIRMWARE: > > * Speed > * Firmware is needed for accessing the boot device, and the user doesn't > diff --git a/Documentation/x86/microcode.txt b/Documentation/x86/microcode.txt > index f57e1b45e628..aacd2f5e1a46 100644 > --- a/Documentation/x86/microcode.txt > +++ b/Documentation/x86/microcode.txt > @@ -108,12 +108,11 @@ packages already put them there. > ==================== > > The loader supports also loading of a builtin microcode supplied through > -the regular firmware builtin method CONFIG_FIRMWARE_IN_KERNEL. Only > -64-bit is currently supported. > +the regular firmware builtin method CONFIG_EXTRA_FIRMWARE. Only 64-bit is > +currently supported. s/regular firmware builtin method /regular builtin firmware method With that fixed: Acked-by: Ingo Molnar <mingo@xxxxxxxxxx> Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
