From patchwork Sat May 22 17:14:15 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: 101650
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 o4MHFCnG017302
	for <patchwork-omap@patchwork.kernel.org>;
	Sat, 22 May 2010 17:15:12 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755901Ab0EVROt (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Sat, 22 May 2010 13:14:49 -0400
Received: from mail-bw0-f46.google.com ([209.85.214.46]:57665 "EHLO
	mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755831Ab0EVROn (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Sat, 22 May 2010 13:14:43 -0400
Received: by bwz7 with SMTP id 7so383738bwz.19
	for <linux-omap@vger.kernel.org>;
	Sat, 22 May 2010 10:14:41 -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=nbExXAoUpqqd0FHfl4M35Kyv8oJok4FzoHUU12ybFjA=;
	b=G6kCq/MWJCzNWkFvoUCWEFRWp7BwkNRhsE1/ngIGABL2sUTeS8KLPYQcCf8T7EfwJw
	KStx05u96pHD767YaRtYqLphO4hJQ38AeiUsDtgRS5u0oBhdrwjH6joVxCyk6036ByAt
	+QTuUyxHDKF+Tom3GxIDx13CAsQRPG65fRHaQ=
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=WbRzYVUra4LVUVYWCilqFHUT7Oniy8nMGMOCUkgS7CSRjlOUBf/ypR74qvHXwaFnfF
	QSV6DCAGvgLpUvmDiS6RJ2hUEtrSrglRCdT7VGTHYJ6fNbNXAlf0d0eraWAwT/PaQVWG
	VjtKWpc4OMUCqVlocKsmKs831izn9Lo3CNXGk=
Received: by 10.204.45.76 with SMTP id d12mr586053bkf.147.1274548480832;
	Sat, 22 May 2010 10:14:40 -0700 (PDT)
Received: from localhost (a91-153-253-80.elisa-laajakaista.fi
	[91.153.253.80]) by mx.google.com with ESMTPS id
	a11sm10178618bkc.15.2010.05.22.10.14.40
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Sat, 22 May 2010 10:14:40 -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>,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v3 04/14] omap: mailbox: 2420 should be detected at run-time
Date: Sat, 22 May 2010 20:14:15 +0300
Message-Id: <1274548465-20208-5-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: <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]);
	Sat, 22 May 2010 17:15:13 +0000 (UTC)


diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index edcfec6..f67cb2c 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -455,7 +455,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()) {