diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-07-11 21:53:59 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-07-11 21:53:59 +0400 |
| commit | f16f5280a9c36d47710017e5a9fffa467ade3a30 (patch) | |
| tree | 2624e53e7e9e6e90d64d581121870c79136a205f /arch/x86/kernel/cpu/Makefile | |
| parent | 08b0e1b12f7c607f784e30105eb19cacb2f2b02b (diff) | |
| parent | ca789c61deb0219cd3fefdb26090bbc9701deada (diff) | |
Merge branch 'tracking-big-LITTLE-MP-v2' into merge-linux-linaro-core-trackingtracking-llct-ll-20120712.0tracking-llct-ll-20120711.0llct-20120711.0
Diffstat (limited to 'arch/x86/kernel/cpu/Makefile')
| -rw-r--r-- | arch/x86/kernel/cpu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 6ab6aa2fdfdd..c5981267a60c 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -14,7 +14,7 @@ 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 += vmware.o hypervisor.o mshyperv.o obj-y += rdrand.o obj-y += match.o |