From patchwork Thu May 13 17:47:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 99356 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 o4DHmN3O011759 for ; Thu, 13 May 2010 17:48:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758584Ab0EMRsV (ORCPT ); Thu, 13 May 2010 13:48:21 -0400 Received: from fg-out-1718.google.com ([72.14.220.155]:64611 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753870Ab0EMRsT (ORCPT ); Thu, 13 May 2010 13:48:19 -0400 Received: by fg-out-1718.google.com with SMTP id d23so1239991fga.1 for ; Thu, 13 May 2010 10:48:19 -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=2uIDb5SzvE2Vd0597CgPuYhgWGcVt0OOz9/bw2BWlAQ=; b=v5n9c/qX5RoX2d4/OewvyOVOku7b0P+4iE/fws1TW5+PjiP9aR9FbkthOpJCep0FV6 i1eHf47XwT6hyhKZaM+l0CwZvFWPhHb11ClB7tP0AXb+BiViOEX0u1ylFJFtkIZqLIRO TXKx7+DInU/sKCmYwv6rIhkYREYRdodoPmGQI= 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=xWjMosA/dwo3HysK98xCIVl9On67ejf8KMF1nNZGMnJlb7SEkJRofoU5F96E8r3qYI zeikrhjnTfOnSm1pbeKxDdlsCBoYVy7yPFTCetX8kjiDolzUyn3amDN7wVmsNue18q1p UqHLkvTbPuMObN1zz54cTOOph3cA5TDB9nLgM= Received: by 10.86.124.8 with SMTP id w8mr1117646fgc.8.1273772898957; Thu, 13 May 2010 10:48:18 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id 12sm9425559fgg.4.2010.05.13.10.48.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 13 May 2010 10:48:18 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: linux-arm , Hiroshi Doyu , Tony Lindgren , Russell King , Felipe Contreras Subject: [PATCH 03/15] omap: mailbox: 2420 should be detected at run-time Date: Thu, 13 May 2010 20:47:24 +0300 Message-Id: <1273772856-10881-4-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1273772856-10881-1-git-send-email-felipe.contreras@gmail.com> References: <1273772856-10881-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]); Thu, 13 May 2010 17:48:23 +0000 (UTC) diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 252e53b..6d17da8 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -431,7 +431,8 @@ err_dsp: static int __devexit omap2_mbox_remove(struct platform_device *pdev) { #if defined(CONFIG_ARCH_OMAP2420) - omap_mbox_unregister(&mbox_iva_info); + if (cpu_is_omap2420()) + omap_mbox_unregister(&mbox_iva_info); #endif if (cpu_is_omap44xx()) {