summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-20 12:07:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-20 12:07:54 -0800
commit2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45 (patch)
tree3671fd287ecbe739cb79537fb5353bcecb939aa9 /arch/x86/kernel/cpu/Makefile
parent4500cf60dbe4b7f514d11b24c3e1edfda2a6d69d (diff)
parent9c079129d7bfb24251890e40694fd79dd1872ed9 (diff)
downloadop-kernel-dev-2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45.zip
op-kernel-dev-2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45.tar.gz
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/kernel/cpu/Makefile')
-rw-r--r--arch/x86/kernel/cpu/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 6359506..7fd54f0 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -42,6 +42,7 @@ endif
obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
+obj-$(CONFIG_MICROCODE) += microcode/
obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o perf_event_amd_ibs.o
OpenPOWER on IntegriCloud