From patchwork Fri May 21 21:44:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 101553 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 o4LLj846008499 for ; Fri, 21 May 2010 21:45:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753412Ab0EUVpH (ORCPT ); Fri, 21 May 2010 17:45:07 -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 S1753040Ab0EUVpF (ORCPT ); Fri, 21 May 2010 17:45:05 -0400 Received: by mail-fx0-f46.google.com with SMTP id 5so1251271fxm.19 for ; Fri, 21 May 2010 14:45:04 -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=xl9MJQs+WbhVxVh9vp0f990+S6MJu/8BcLdp5gA84LilzBAHbHikc6t+5teKidj8+8 PWzes3R7nh6J8yxCz+XTNPrkZloacajOJyS/c8rD3CYmBz3ua6Zg73YQSPJT4T6DoTeS oaB0vGQeaQ5jgmi55RcWythqXPA0IxHPrCFqo= 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=rGiODhQ91mBQ6odEyWy8O9bugQYqt1DtwyGJlbl7NLb9xo1bvXAKpTp2G5IWAMQF6D psRW1+JKC0Agan1zwvqH4EwscRIFlw52xyBTtMYzyn7BkZ6TR59qn4XLnzRES9Y9A3EX jQSovDtW7s0GxHInSlKYCTi43FkAZhfpUCeWI= Received: by 10.204.23.15 with SMTP id p15mr206173bkb.115.1274478304760; Fri, 21 May 2010 14:45:04 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id 24sm6254833bkr.12.2010.05.21.14.45.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 21 May 2010 14:45:04 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: linux-arm , Hiroshi Doyu , Tony Lindgren , Felipe Contreras Subject: [PATCH v2t2 05/17] omap: mailbox: use correct config for omap1 Date: Sat, 22 May 2010 00:44:37 +0300 Message-Id: <1274478289-22188-6-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:08 +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