git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'prcm_scm_misc_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes
[pandora-kernel.git]
/
arch
/
ia64
/
dig
/
Makefile
diff --git
a/arch/ia64/dig/Makefile
b/arch/ia64/dig/Makefile
index
2f7cadd
..
ae16ec4
100644
(file)
--- a/
arch/ia64/dig/Makefile
+++ b/
arch/ia64/dig/Makefile
@@
-6,7
+6,7
@@
#
obj-y := setup.o
-ifeq ($(CONFIG_
DMAR
), y)
+ifeq ($(CONFIG_
INTEL_IOMMU
), y)
obj-$(CONFIG_IA64_GENERIC) += machvec.o machvec_vtd.o
else
obj-$(CONFIG_IA64_GENERIC) += machvec.o