From patchwork Sat May 22 17:14:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 101649 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 o4MHFCnF017302 for ; Sat, 22 May 2010 17:15:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755868Ab0EVROr (ORCPT ); Sat, 22 May 2010 13:14:47 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:55289 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755830Ab0EVROn (ORCPT ); Sat, 22 May 2010 13:14:43 -0400 Received: by mail-bw0-f46.google.com with SMTP id 7so383709bwz.19 for ; Sat, 22 May 2010 10:14:43 -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=pRA2uBisF1PEANqBt9wIRKC87hHOOZyy2pmYnzIEmy9E6pw1sXMflObwKZo7hhfkUN HmG91fmVJzivssHxFO+PJ4na0fkootNiQDrRN2SlZfMqHyFUVpxdRZOO/QF1o3A87XIO IYfKN3D24iHlzQ6sWwlCOoXhE6FAp41ckJzSQ= 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=XkcyYUClb19JYhaoJD+9S0QqVUT89G7FYyYZmEYWozQrBfmH+OtU1jf6siIWjzj000 x2LurAIiKlXp0xzr+jHKN3Ny3nTZrfiPrmpMGoCAl+pfRUZrRPyfIWk49Lla0mkPh545 uyIuKnKoFWmrYC+dlNW/EbmPU7RhS2fVGVfNA= Received: by 10.204.135.214 with SMTP id o22mr811082bkt.90.1274548482986; Sat, 22 May 2010 10:14:42 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id d5sm10192428bkd.7.2010.05.22.10.14.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 22 May 2010 10:14:42 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: linux-arm , Hiroshi Doyu , Tony Lindgren , Felipe Contreras Subject: [PATCH v3 05/14] omap: mailbox: use correct config for omap1 Date: Sat, 22 May 2010 20:14:16 +0300 Message-Id: <1274548465-20208-6-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274548465-20208-1-git-send-email-felipe.contreras@gmail.com> References: <1274548465-20208-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]); Sat, 22 May 2010 17:15:12 +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