Merge 3.3-rc6 into driver-core-next
[pandora-kernel.git] / arch / x86 / kernel / cpu / Makefile
index fe6eb19..6ab6aa2 100644 (file)
@@ -15,6 +15,8 @@ CFLAGS_common.o               := $(nostackp)
 obj-y                  := intel_cacheinfo.o scattered.o topology.o
 obj-y                  += proc.o capflags.o powerflags.o common.o
 obj-y                  += vmware.o hypervisor.o sched.o mshyperv.o
+obj-y                  += rdrand.o
+obj-y                  += match.o
 
 obj-$(CONFIG_X86_32)   += bugs.o
 obj-$(CONFIG_X86_64)   += bugs_64.o