aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/Makefile2
-rw-r--r--arch/x86/kernel/microcode_intel.c (renamed from arch/x86/kernel/microcode.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 3db651fc8ec5..a9be2a0dde80 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -51,7 +51,7 @@ obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o
51obj-$(CONFIG_MCA) += mca_32.o 51obj-$(CONFIG_MCA) += mca_32.o
52obj-$(CONFIG_X86_MSR) += msr.o 52obj-$(CONFIG_X86_MSR) += msr.o
53obj-$(CONFIG_X86_CPUID) += cpuid.o 53obj-$(CONFIG_X86_CPUID) += cpuid.o
54obj-$(CONFIG_MICROCODE) += microcode.o 54obj-$(CONFIG_MICROCODE) += microcode_intel.o
55obj-$(CONFIG_PCI) += early-quirks.o 55obj-$(CONFIG_PCI) += early-quirks.o
56apm-y := apm_32.o 56apm-y := apm_32.o
57obj-$(CONFIG_APM) += apm.o 57obj-$(CONFIG_APM) += apm.o
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode_intel.c
index 4e7b2f65fed6..4e7b2f65fed6 100644
--- a/arch/x86/kernel/microcode.c
+++ b/arch/x86/kernel/microcode_intel.c