Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
[linux-2.6] / arch / x86 / kernel / cpu / mcheck / Makefile
1 obj-y                           =  mce.o therm_throt.o
2
3 obj-$(CONFIG_X86_NEW_MCE)       += mce-severity.o
4 obj-$(CONFIG_X86_OLD_MCE)       += k7.o p4.o p6.o
5 obj-$(CONFIG_X86_ANCIENT_MCE)   += winchip.o p5.o
6 obj-$(CONFIG_X86_MCE_P4THERMAL) += mce_intel.o
7 obj-$(CONFIG_X86_MCE_INTEL)     += mce_intel_64.o mce_intel.o
8 obj-$(CONFIG_X86_MCE_AMD)       += mce_amd_64.o
9 obj-$(CONFIG_X86_MCE_NONFATAL)  += non-fatal.o
10 obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o
11 obj-$(CONFIG_X86_MCE_INJECT)    += mce-inject.o