From patchwork Fri May 14 15:01:38 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Felipe Contreras <felipe.contreras@gmail.com>
X-Patchwork-Id: 99628
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 o4EF2Gxt031773
	for <patchwork-omap@patchwork.kernel.org>;
	Fri, 14 May 2010 15:02:16 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755319Ab0ENPCP (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Fri, 14 May 2010 11:02:15 -0400
Received: from ey-out-2122.google.com ([74.125.78.27]:31925 "EHLO
	ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754805Ab0ENPCN (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Fri, 14 May 2010 11:02:13 -0400
Received: by ey-out-2122.google.com with SMTP id d26so283220eyd.19
	for <linux-omap@vger.kernel.org>;
	Fri, 14 May 2010 08:02:12 -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=KqFQIDKOTVi+7dhMjiFpaD7il7u88gwTjdbfDxd6Pl8=;
	b=rz6jzbe7H1czGdJDsbFtB+TBW4IG9UvVINQ8H0IdP/Gv6DNItR55CvidDotXF4wPlj
	7zeg25Mt0qrwO2bK/7K73rApfbdo3P6sBTU21Pnk0i0Afqcp0R2ZWUhO1GrX6ScNbNC3
	gpRg1M5mg/DgIXL2vwGvr9iP8S31l3CwCYJr4=
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=oL8kobfVVU5T+X1/JESaDv1QkY1gV+8ewyghGFvCPA6RyDT+tmsx8qr9BAL7gc9KOJ
	Ap4DyJpHsaSgV7WgY46DduFTxXCA5ELYUAaqlFRc2A7xGU96wZ9rI+FVq1QLFMGEZiqW
	+sP/qswv12I2GPr3A5G4CV9bRWqo2C6RmS6ak=
Received: by 10.213.47.74 with SMTP id m10mr749546ebf.38.1273849332831;
	Fri, 14 May 2010 08:02:12 -0700 (PDT)
Received: from localhost ([192.100.124.156])
	by mx.google.com with ESMTPS id 16sm1312385ewy.3.2010.05.14.08.02.12
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Fri, 14 May 2010 08:02:12 -0700 (PDT)
From: Felipe Contreras <felipe.contreras@gmail.com>
To: linux-omap <linux-omap@vger.kernel.org>
Cc: linux-arm <linux-arm-kernel@lists.infradead.org>,
	Hiroshi Doyu <hiroshi.doyu@nokia.com>, Tony Lindgren <tony@atomide.com>,
	Russell King <linux@arm.linux.org.uk>,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 05/17] omap: mailbox: use correct config for omap1
Date: Fri, 14 May 2010 18:01:38 +0300
Message-Id: <1273849310-32169-6-git-send-email-felipe.contreras@gmail.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <1273849310-32169-1-git-send-email-felipe.contreras@gmail.com>
References: <1273849310-32169-1-git-send-email-felipe.contreras@gmail.com>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
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, 14 May 2010 15:02:17 +0000 (UTC)


diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 462b59c..da796f2 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -63,7 +63,7 @@ static void omap_init_rtc(void)
 static inline void omap_init_rtc(void) {}
 #endif
 
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
+#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
 
 #if defined(CONFIG_ARCH_OMAP15XX)
 #  define OMAP1_MBOX_SIZE	0x23