Merge branch 'for-2.6.30' into for-2.6.31
[linux-2.6] / arch / x86 / kernel / cpu / mcheck / Makefile
1 obj-y                           =  mce_$(BITS).o therm_throt.o
2
3 obj-$(CONFIG_X86_32)            += k7.o p4.o p5.o p6.o winchip.o
4 obj-$(CONFIG_X86_MCE_INTEL)     += mce_intel_64.o
5 obj-$(CONFIG_X86_MCE_AMD)       += mce_amd_64.o
6 obj-$(CONFIG_X86_MCE_NONFATAL)  += non-fatal.o
7 obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o