projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[linux-2.6]
/
arch
/
ia64
/
kvm
/
Makefile
diff --git
a/arch/ia64/kvm/Makefile
b/arch/ia64/kvm/Makefile
index
cb69dfc
..
0bb99b7
100644
(file)
--- a/
arch/ia64/kvm/Makefile
+++ b/
arch/ia64/kvm/Makefile
@@
-51,7
+51,7
@@
EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
coalesced_mmio.o irq_comm.o)
-ifeq ($(CONFIG_
DMAR
),y)
+ifeq ($(CONFIG_
IOMMU_API
),y)
common-objs += $(addprefix ../../../virt/kvm/, iommu.o)
endif