From 5a72cf4be59769154b2953a85108b5e589e4edaf Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Wed, 28 Sep 2011 17:16:04 +0800 Subject: [PATCH] --- yaml --- r: 272617 b: refs/heads/master c: 742b6c6f3e15331cec4ab420a639d5239ef2a02a h: refs/heads/master i: 272615: fd8d50dc419b8094bc1151651b533999d82a61c4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Makefile | 4 ++-- trunk/arch/arm/mach-imx/{mm-imx31.c => mm-imx3.c} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename trunk/arch/arm/mach-imx/{mm-imx31.c => mm-imx3.c} (100%) diff --git a/[refs] b/[refs] index c3b3dae6df07..aaa987e76255 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1263de200a25e89a2529202889e75bfd50320ba +refs/heads/master: 742b6c6f3e15331cec4ab420a639d5239ef2a02a diff --git a/trunk/arch/arm/mach-imx/Makefile b/trunk/arch/arm/mach-imx/Makefile index 4fe6bbe78dab..8ec4a4ca1489 100644 --- a/trunk/arch/arm/mach-imx/Makefile +++ b/trunk/arch/arm/mach-imx/Makefile @@ -8,8 +8,8 @@ obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o obj-$(CONFIG_MACH_MX27) += 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/trunk/arch/arm/mach-imx/mm-imx31.c b/trunk/arch/arm/mach-imx/mm-imx3.c similarity index 100% rename from trunk/arch/arm/mach-imx/mm-imx31.c rename to trunk/arch/arm/mach-imx/mm-imx3.c