Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[linux-2.6] / arch / i386 / kernel / cpu / mcheck / Makefile
1 obj-y   =       mce.o k7.o p4.o p5.o p6.o winchip.o
2 obj-$(CONFIG_X86_MCE_NONFATAL)  +=      non-fatal.o