diff options
| author | Joerg Roedel <joro@8bytes.org> | 2012-12-03 12:40:59 -0500 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2012-12-03 12:40:59 -0500 |
| commit | 18e170d03bcd17f5ccb35b271a95783f63145be7 (patch) | |
| tree | 5ce68cab628b93119d4c160efc6092e1ba6fa93e /arch/arm/mach-omap2/Makefile | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
| parent | 2ab7c84815cffd5fe4946a472fc67fefa8ac3c29 (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/omap
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index fe40d9e488c9..d6721a7f4c3b 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -184,8 +184,6 @@ obj-$(CONFIG_HW_PERF_EVENTS) += pmu.o | |||
| 184 | obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o | 184 | obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o |
| 185 | mailbox_mach-objs := mailbox.o | 185 | mailbox_mach-objs := mailbox.o |
| 186 | 186 | ||
| 187 | obj-$(CONFIG_OMAP_IOMMU) += iommu2.o | ||
| 188 | |||
| 189 | iommu-$(CONFIG_OMAP_IOMMU) := omap-iommu.o | 187 | iommu-$(CONFIG_OMAP_IOMMU) := omap-iommu.o |
| 190 | obj-y += $(iommu-m) $(iommu-y) | 188 | obj-y += $(iommu-m) $(iommu-y) |
| 191 | 189 | ||