From patchwork Mon May 24 06:36:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi DOYU X-Patchwork-Id: 101816 X-Patchwork-Delegate: hiroshi.doyu@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4O6alIV017876 for ; Mon, 24 May 2010 06:36:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753603Ab0EXGgr (ORCPT ); Mon, 24 May 2010 02:36:47 -0400 Received: from smtp.nokia.com ([192.100.122.230]:26093 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751430Ab0EXGgq (ORCPT ); Mon, 24 May 2010 02:36:46 -0400 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4O6a5VW024250; Mon, 24 May 2010 09:36:28 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 24 May 2010 09:36:26 +0300 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Mon, 24 May 2010 09:36:26 +0300 Received: from localhost (esdhcp041238.research.nokia.com [172.21.41.238]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4O6aPKM006425; Mon, 24 May 2010 09:36:25 +0300 Date: Mon, 24 May 2010 09:36:25 +0300 (EEST) Message-Id: <20100524.093625.241440026.Hiroshi.DOYU@nokia.com> To: felipe.contreras@gmail.com Cc: linux@arm.linux.org.uk, linux-omap@vger.kernel.org, tony@atomide.com, linux-arm-kernel@lists.infradead.org, felipe.contreras@nokia.com Subject: Re: [PATCH v2t2 00/17] omap: mailbox: From: Hiroshi DOYU In-Reply-To: <20100522.081415.258113387.Hiroshi.DOYU@nokia.com> References: <20100521221557.GM11042@n2100.arm.linux.org.uk> <20100522.081415.258113387.Hiroshi.DOYU@nokia.com> X-Mailer: Mew version 6.2 on Emacs 22.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 X-OriginalArrivalTime: 24 May 2010 06:36:26.0748 (UTC) FILETIME=[6F81F3C0:01CAFB0B] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 24 May 2010 06:36:48 +0000 (UTC) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 7d2cf0f..4d754f6 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)