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 '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
Makefile
diff --git
a/arch/ia64/kernel/Makefile
b/arch/ia64/kernel/Makefile
index
395c2f2
..
d959c84
100644
(file)
--- a/
arch/ia64/kernel/Makefile
+++ b/
arch/ia64/kernel/Makefile
@@
-43,7
+43,7
@@
obj-$(CONFIG_IA64_ESI) += esi.o
ifneq ($(CONFIG_IA64_ESI),)
obj-y += esi_stub.o # must be in kernel proper
endif
-obj-$(CONFIG_
DMAR)
+= pci-dma.o
+obj-$(CONFIG_
INTEL_IOMMU)
+= pci-dma.o
obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
obj-$(CONFIG_BINFMT_ELF) += elfcore.o