From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Date: Mon, 24 May 2010 06:35:11 +0000 (+0300)
Subject: omap iommu: Make omap-iommu.o built-in
X-Git-Tag: v2.6.36-rc1~488^2~85^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bbc6fcff6f34ee9cc388d1abc811ac09bf0ddaf;p=platform%2Fkernel%2Flinux-3.10.git

omap iommu: Make omap-iommu.o built-in

This is a platform device registration.

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
---

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index ea52b03..6c6d7c6 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)