From 1104cb3fb5da842a4046f0a6f1e7746ddc69d375 Mon Sep 17 00:00:00 2001 From: Peter Oruba Date: Mon, 28 Jul 2008 18:44:16 +0200 Subject: [PATCH] --- yaml --- r: 113315 b: refs/heads/master c: 1abae31096007cc993f67ae2576fe8f812270ad6 h: refs/heads/master i: 113313: e5537acbe0931e144cc3b7d8c26d923bc9f3dcab 113311: 9be5fcac0b70874267ad29afffbf7021533c4c0d v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 2 +- trunk/arch/x86/kernel/{microcode.c => microcode_intel.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86/kernel/{microcode.c => microcode_intel.c} (100%) diff --git a/[refs] b/[refs] index 780aabee4bff..f0244b2491c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3b71bcec0380836caac9b524fa1585b469b7456 +refs/heads/master: 1abae31096007cc993f67ae2576fe8f812270ad6 diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index 3db651fc8ec5..a9be2a0dde80 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/arch/x86/kernel/Makefile @@ -51,7 +51,7 @@ obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o obj-$(CONFIG_MCA) += mca_32.o obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_CPUID) += cpuid.o -obj-$(CONFIG_MICROCODE) += microcode.o +obj-$(CONFIG_MICROCODE) += microcode_intel.o obj-$(CONFIG_PCI) += early-quirks.o apm-y := apm_32.o obj-$(CONFIG_APM) += apm.o diff --git a/trunk/arch/x86/kernel/microcode.c b/trunk/arch/x86/kernel/microcode_intel.c similarity index 100% rename from trunk/arch/x86/kernel/microcode.c rename to trunk/arch/x86/kernel/microcode_intel.c