diff options
| author |   Hiroshi DOYU <Hiroshi.DOYU@nokia.com> | 2010-05-24 09:35:11 +0300 |
|---|---|---|
| committer | Hiroshi DOYU <Hiroshi.DOYU@nokia.com> | 2010-06-29 07:55:07 +0300 |
| commit | 0bbc6fcff6f34ee9cc388d1abc811ac09bf0ddaf (patch) | |
| tree | 6cf055c617daca0a3d67fb23af688f08bbc5a9a7 /arch/arm/mach-omap2/Makefile | |
| parent | omap iommu: move iommu_disable at fault to the above layer (diff) | |
| download | linux-dev-0bbc6fcff6f34ee9cc388d1abc811ac09bf0ddaf.tar.xz linux-dev-0bbc6fcff6f34ee9cc388d1abc811ac09bf0ddaf.zip | |
omap iommu: Make omap-iommu.o built-in
This is a platform device registration.
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index ea52b034e963..6c6d7c6f7aee 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -89,7 +89,10 @@ obj-$(CONFIG_OMAP3_EMU) += emu.o obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o mailbox_mach-objs := mailbox.o -obj-$(CONFIG_OMAP_IOMMU) := iommu2.o omap-iommu.o +obj-$(CONFIG_OMAP_IOMMU) += iommu2.o + +iommu-$(CONFIG_OMAP_IOMMU) := omap-iommu.o +obj-y += $(iommu-m) $(iommu-y) i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o obj-y += $(i2c-omap-m) $(i2c-omap-y) |