projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
kvm
/
Makefile
diff --git
a/arch/arm64/kvm/Makefile
b/arch/arm64/kvm/Makefile
index
60fd181
..
13b0172
100644
(file)
--- a/
arch/arm64/kvm/Makefile
+++ b/
arch/arm64/kvm/Makefile
@@
-24,4
+24,4
@@
kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \
vgic/vgic-its.o vgic/vgic-debug.o
-kvm-$(CONFIG_
KVM_ARM_PMU
) += pmu-emul.o
+kvm-$(CONFIG_
HW_PERF_EVENTS
) += pmu-emul.o