linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] arm/imx: rename mm-imx31.c to mm-imx3.c
Date: Wed, 28 Sep 2011 17:16:04 +0800	[thread overview]
Message-ID: <1317201368-6403-3-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <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 <shawn.guo@linaro.org>
---
 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/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
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
-- 
1.7.4.1

  parent reply	other threads:[~2011-09-28  9:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-28  9:16 [PATCH 0/6] Support single zImage for imx3 and imx6 Shawn Guo
2011-09-28  9:16 ` [PATCH 1/6] arm/imx: merge mm-imx35.c into mm-imx31.c Shawn Guo
2011-09-28  9:16 ` Shawn Guo [this message]
2011-09-28  9:16 ` [PATCH 3/6] arm/imx: change mxc_init_l2x0() to an imx31/35 specific call Shawn Guo
2011-09-28  9:16 ` [PATCH 4/6] arm/imx: remove cpu_is_xxx() from arch_idle() Shawn Guo
2011-09-29  8:59   ` Sascha Hauer
2011-09-29 14:22     ` Shawn Guo
2011-09-28  9:16 ` [PATCH 5/6] arm/imx: remove cpu_is_xxx() check from __imx_ioremap() Shawn Guo
2011-09-28  9:16 ` [PATCH 6/6] arm/imx: merge i.MX3 and i.MX6 Shawn Guo
2011-09-28 12:18   ` Sascha Hauer
2011-09-29  5:17     ` Shawn Guo
2011-09-29  8:35       ` Sascha Hauer
2011-09-28 12:20 ` [PATCH 0/6] Support single zImage for imx3 and imx6 Sascha Hauer
2011-09-29  5:19   ` Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1317201368-6403-3-git-send-email-shawn.guo@linaro.org \
    --to=shawn.guo@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).