From 2f6fac8cd314b836b56fe4196f73b9638fb484b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Wed, 9 Dec 2009 19:52:57 +0100 Subject: [PATCH] --- yaml --- r: 187492 b: refs/heads/master c: 60d644cae9d96e13547c69fbac22e800790e6054 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/Makefile | 2 +- trunk/arch/arm/mach-mx3/{clock.c => clock-imx31.c} | 0 trunk/arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/arm/mach-mx3/{clock.c => clock-imx31.c} (100%) rename trunk/arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} (100%) diff --git a/[refs] b/[refs] index d62bea2066bf..da3ba293d644 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f568dd7f5805bfa9e99f6df866300498b55eb8f4 +refs/heads/master: 60d644cae9d96e13547c69fbac22e800790e6054 diff --git a/trunk/arch/arm/mach-mx3/Makefile b/trunk/arch/arm/mach-mx3/Makefile index 93c7b296be6a..03e25d604455 100644 --- a/trunk/arch/arm/mach-mx3/Makefile +++ b/trunk/arch/arm/mach-mx3/Makefile @@ -5,7 +5,7 @@ # Object file lists. obj-y := mm.o devices.o cpu.o -obj-$(CONFIG_ARCH_MX31) += clock.o iomux.o +obj-$(CONFIG_ARCH_MX31) += clock-imx31.o iomux-imx31.o obj-$(CONFIG_ARCH_MX35) += clock-imx35.o obj-$(CONFIG_MACH_MX31ADS) += mx31ads.o obj-$(CONFIG_MACH_MX31LILLY) += mx31lilly.o mx31lilly-db.o diff --git a/trunk/arch/arm/mach-mx3/clock.c b/trunk/arch/arm/mach-mx3/clock-imx31.c similarity index 100% rename from trunk/arch/arm/mach-mx3/clock.c rename to trunk/arch/arm/mach-mx3/clock-imx31.c diff --git a/trunk/arch/arm/mach-mx3/iomux.c b/trunk/arch/arm/mach-mx3/iomux-imx31.c similarity index 100% rename from trunk/arch/arm/mach-mx3/iomux.c rename to trunk/arch/arm/mach-mx3/iomux-imx31.c