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 tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
Makefile
diff --git
a/arch/arm/mach-omap2/Makefile
b/arch/arm/mach-omap2/Makefile
index
c94d495
..
d5e834a
100644
(file)
--- a/
arch/arm/mach-omap2/Makefile
+++ b/
arch/arm/mach-omap2/Makefile
@@
-196,8
+196,6
@@
obj-$(CONFIG_HW_PERF_EVENTS) += pmu.o
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
mailbox_mach-objs := mailbox.o
-obj-$(CONFIG_OMAP_IOMMU) += iommu2.o
-
iommu-$(CONFIG_OMAP_IOMMU) := omap-iommu.o
obj-y += $(iommu-m) $(iommu-y)