diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 15:07:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 15:07:54 -0500 |
| commit | 2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45 (patch) | |
| tree | 3671fd287ecbe739cb79537fb5353bcecb939aa9 /arch/x86/Kconfig | |
| parent | 4500cf60dbe4b7f514d11b24c3e1edfda2a6d69d (diff) | |
| parent | 9c079129d7bfb24251890e40694fd79dd1872ed9 (diff) | |
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 microcode loader updates from Ingo Molnar:
"There are two main changes in this tree:
- AMD microcode early loading fixes
- some microcode loader source files reorganization"
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode: Move to a proper location
x86, microcode, AMD: Fix early ucode loading
x86, microcode: Share native MSR accessing variants
x86, ramdisk: Export relocated ramdisk VA
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 9b8ecfc00fa1..6a990e2107f5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1065,10 +1065,6 @@ config MICROCODE_OLD_INTERFACE | |||
| 1065 | def_bool y | 1065 | def_bool y |
| 1066 | depends on MICROCODE | 1066 | depends on MICROCODE |
| 1067 | 1067 | ||
| 1068 | config MICROCODE_INTEL_LIB | ||
| 1069 | def_bool y | ||
| 1070 | depends on MICROCODE_INTEL | ||
| 1071 | |||
| 1072 | config MICROCODE_INTEL_EARLY | 1068 | config MICROCODE_INTEL_EARLY |
| 1073 | def_bool n | 1069 | def_bool n |
| 1074 | 1070 | ||