From patchwork Tue Jan 10 19:24:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 135296 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E1497B6FC8 for ; Wed, 11 Jan 2012 06:30:21 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RkhJN-0005vl-2T; Tue, 10 Jan 2012 19:24:45 +0000 Received: from mail-yx0-f177.google.com ([209.85.213.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RkhJJ-0005vX-CT for linux-arm-kernel@lists.infradead.org; Tue, 10 Jan 2012 19:24:42 +0000 Received: by yenl2 with SMTP id l2so2319802yen.36 for ; Tue, 10 Jan 2012 11:24:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=WFzDFctPhlyZxGnFfo/VCGKZPfTcSIgktacHKKK3vDc=; b=aw7jWi6YA/YIltY5EqHIDBdS4hIgQESOAcl4kqpLtpxYdB3FJtJzt2YUfwVLzHZ1fb B6J1ndZF324EEyuWqD8MlqonHyi2TaxnND8b5OH8tGYVanj1AFm+mld+XQHzQZDBpGIW bEeXN03URBQd+MlkvvEG90DncRc4KYH2HJxVg= Received: by 10.236.78.6 with SMTP id f6mr29487351yhe.109.1326223479057; Tue, 10 Jan 2012 11:24:39 -0800 (PST) Received: from localhost.localdomain ([189.5.21.38]) by mx.google.com with ESMTPS id i12sm1591358anm.6.2012.01.10.11.24.36 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jan 2012 11:24:38 -0800 (PST) From: Fabio Estevam To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: imx: Fix build error due to redefinition of 'mx50_io_desc' Date: Tue, 10 Jan 2012 17:24:30 -0200 Message-Id: <1326223470-30116-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (festevam[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.213.177 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Fabio Estevam , Fabio Estevam , kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Fix the following build error: CC arch/arm/mach-imx/mm-imx5.o arch/arm/mach-imx/mm-imx5.c:57: error: redefinition of 'mx50_io_desc' arch/arm/mach-imx/mm-imx5.c:47: note: previous definition of 'mx50_io_desc' was here Signed-off-by: Fabio Estevam --- This applies against linux-next arch/arm/mach-imx/mm-imx5.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-imx/mm-imx5.c b/arch/arm/mach-imx/mm-imx5.c index 2f04f8a..16671b7 100644 --- a/arch/arm/mach-imx/mm-imx5.c +++ b/arch/arm/mach-imx/mm-imx5.c @@ -52,16 +52,6 @@ static struct map_desc mx50_io_desc[] __initdata = { }; /* - * Define the MX50 memory map. - */ -static struct map_desc mx50_io_desc[] __initdata = { - imx_map_entry(MX50, TZIC, MT_DEVICE), - imx_map_entry(MX50, SPBA0, MT_DEVICE), - imx_map_entry(MX50, AIPS1, MT_DEVICE), - imx_map_entry(MX50, AIPS2, MT_DEVICE), -}; - -/* * Define the MX51 memory map. */ static struct map_desc mx51_io_desc[] __initdata = {