From patchwork Fri May 21 21:44:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 101561 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 o4LLjYkX008765 for ; Fri, 21 May 2010 21:45:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754498Ab0EUVpc (ORCPT ); Fri, 21 May 2010 17:45:32 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:40510 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754318Ab0EUVpb (ORCPT ); Fri, 21 May 2010 17:45:31 -0400 Received: by mail-fx0-f46.google.com with SMTP id 5so1251271fxm.19 for ; Fri, 21 May 2010 14:45:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=3HW8RTd1GJ9S6HYdKtaLtrzAPecUjHrrZcFlj2/Tk+c=; b=Knj0tNpRswNcWvnMQeEaDYXHqe4KjHcZMLX578IYwiUY7TiNyxUa7bA/TWNT/HazUL 9esJ08tWZU/7UEwnPfqS5+x7G7zR/vHAUvWTEoBjg8UrKe1c02iD1nbJljbCsexMKMI4 VKgXH3QNGYWx0EV+7UwoxJOIbdCBEqLPlNmes= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=KxX/tklCK/USKDTonlGsvh253Zx7gv0Lp0nTsqLeQ4rYdTLj3A/wJ9FHsoClYSqdt1 uU2kWU9LrtB03ScAGGPDNCwkF1jHG+5I64yow3mPch0ogvNPijkHVQBtWFWjGWvAxsxG XnjzmVzyE6YJN5jKfpU+LVperRhG1ouw2rcZI= Received: by 10.204.49.199 with SMTP id w7mr43166bkf.197.1274478330221; Fri, 21 May 2010 14:45:30 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id d13sm6243061bkd.17.2010.05.21.14.45.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 21 May 2010 14:45:29 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: linux-arm , Hiroshi Doyu , Tony Lindgren , Felipe Contreras Subject: [PATCH v2t2 13/17] omap: mailbox: always built-in platform data Date: Sat, 22 May 2010 00:44:45 +0300 Message-Id: <1274478289-22188-14-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274478289-22188-1-git-send-email-felipe.contreras@gmail.com> References: <1274478289-22188-1-git-send-email-felipe.contreras@gmail.com> 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]); Fri, 21 May 2010 21:45:34 +0000 (UTC) diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index b6a537c..c1e1ae5 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -14,9 +14,9 @@ obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o # Power Management obj-$(CONFIG_PM) += pm.o sleep.o -# DSP -obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o -mailbox_mach-objs := mailbox.o +ifneq ($(CONFIG_OMAP_MBOX_FWK),) +obj-y += mailbox.o +endif i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o obj-y += $(i2c-omap-m) $(i2c-omap-y) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 4b9fc57..c9757fb 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -86,8 +86,9 @@ obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o # EMU peripherals obj-$(CONFIG_OMAP3_EMU) += emu.o -obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o -mailbox_mach-objs := mailbox.o +ifneq ($(CONFIG_OMAP_MBOX_FWK),) +obj-y += mailbox.o +endif iommu-y += iommu2.o iommu-$(CONFIG_ARCH_OMAP3) += omap3-iommu.o