From patchwork Wed Sep 28 09:16:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 4400 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id AC78723EF6 for ; Wed, 28 Sep 2011 09:13:46 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id A24BBA18319 for ; Wed, 28 Sep 2011 09:13:46 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 23so522313fxe.11 for ; Wed, 28 Sep 2011 02:13:46 -0700 (PDT) Received: by 10.223.63.8 with SMTP id z8mr1389499fah.84.1317201226559; Wed, 28 Sep 2011 02:13:46 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.3.234 with SMTP id f10cs104640laf; Wed, 28 Sep 2011 02:13:46 -0700 (PDT) Received: by 10.236.185.4 with SMTP id t4mr54385539yhm.121.1317201225463; Wed, 28 Sep 2011 02:13:45 -0700 (PDT) Received: from mail-yw0-f50.google.com (mail-yw0-f50.google.com [209.85.213.50]) by mx.google.com with ESMTPS id i27si2838887yhm.54.2011.09.28.02.13.45 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Sep 2011 02:13:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.213.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.213.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by ywm13 with SMTP id 13so8364510ywm.37 for ; Wed, 28 Sep 2011 02:13:44 -0700 (PDT) Received: by 10.68.36.166 with SMTP id r6mr43022173pbj.77.1317201224701; Wed, 28 Sep 2011 02:13:44 -0700 (PDT) Received: from localhost.localdomain ([180.106.33.106]) by mx.google.com with ESMTPS id i3sm5736502pbg.10.2011.09.28.02.13.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Sep 2011 02:13:44 -0700 (PDT) From: Shawn Guo To: Sascha Hauer Cc: linux-arm-kernel@lists.infradead.org, patches@linaro.org, Shawn Guo Subject: [PATCH 2/6] arm/imx: rename mm-imx31.c to mm-imx3.c Date: Wed, 28 Sep 2011 17:16:04 +0800 Message-Id: <1317201368-6403-3-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1317201368-6403-1-git-send-email-shawn.guo@linaro.org> References: <1317201368-6403-1-git-send-email-shawn.guo@linaro.org> Since mm-imx31.c now is shared between imx31 and imx35, the patch renames mm-imx31.c to mm-imx3.c. Signed-off-by: Shawn Guo --- arch/arm/mach-imx/Makefile | 4 ++-- arch/arm/mach-imx/{mm-imx31.c => mm-imx3.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/mach-imx/{mm-imx31.c => mm-imx3.c} (100%) diff --git a/arch/arm/mach-imx/mm-imx31.c b/arch/arm/mach-imx/mm-imx3.c similarity index 100% rename from arch/arm/mach-imx/mm-imx31.c rename to arch/arm/mach-imx/mm-imx3.c diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 940f130..fb5dfd5 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -8,8 +8,8 @@ obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o -obj-$(CONFIG_SOC_IMX31) += mm-imx31.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o -obj-$(CONFIG_SOC_IMX35) += mm-imx31.o cpu-imx35.o clock-imx35.o ehci-imx35.o +obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o +obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clock-imx35.o ehci-imx35.o obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o # Support for CMOS sensor interface