diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-15 16:49:04 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-15 16:49:04 -0800 |
| commit | c12489ad40a9db6b17225e0f38151d41c6175fe8 (patch) | |
| tree | cf7ea08c0b3bf106975047c66b8bb0b560cc4e3e /arch/x86_64/kernel/Makefile | |
| parent | ff7feac9638e162263463edaeb342b4f3b1ce90e (diff) | |
| parent | 1e185b97b4364063f1135604b87f8d8469944233 (diff) | |
| download | talos-obmc-linux-c12489ad40a9db6b17225e0f38151d41c6175fe8.tar.gz talos-obmc-linux-c12489ad40a9db6b17225e0f38151d41c6175fe8.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/x86_64/kernel/Makefile')
| -rw-r--r-- | arch/x86_64/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 14328cab5d3a..fe4cbd1c4b2f 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -11,6 +11,7 @@ obj-y := process.o signal.o entry.o traps.o irq.o \ obj-$(CONFIG_X86_MCE) += mce.o obj-$(CONFIG_X86_MCE_INTEL) += mce_intel.o +obj-$(CONFIG_X86_MCE_AMD) += mce_amd.o obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/ obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_X86_MSR) += msr.o |
