From 2cb4f79ea04925fe23b49193f0c6839e7961e031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Wed, 9 Dec 2009 20:12:07 +0100 Subject: [PATCH] --- yaml --- r: 187494 b: refs/heads/master c: 95c00464dda726c49ac8c45228bee8bf395ffa97 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx1/Makefile | 4 ++-- trunk/arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} | 2 +- trunk/arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename trunk/arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} (98%) rename trunk/arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} (98%) diff --git a/[refs] b/[refs] index e1fba8122d77..d24dda57fa49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c4c62bcb27cf9200553edeaecac1ab8cc2add91 +refs/heads/master: 95c00464dda726c49ac8c45228bee8bf395ffa97 diff --git a/trunk/arch/arm/mach-mx1/Makefile b/trunk/arch/arm/mach-mx1/Makefile index b72f53638543..297d17210e11 100644 --- a/trunk/arch/arm/mach-mx1/Makefile +++ b/trunk/arch/arm/mach-mx1/Makefile @@ -10,5 +10,5 @@ obj-y += generic.o clock.o devices.o obj-$(CONFIG_MX1_VIDEO) += ksym_mx1.o mx1_camera_fiq.o # Specific board support -obj-$(CONFIG_ARCH_MX1ADS) += mx1ads.o -obj-$(CONFIG_MACH_SCB9328) += scb9328.o +obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o +obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o diff --git a/trunk/arch/arm/mach-mx1/mx1ads.c b/trunk/arch/arm/mach-mx1/mach-mx1ads.c similarity index 98% rename from trunk/arch/arm/mach-mx1/mx1ads.c rename to trunk/arch/arm/mach-mx1/mach-mx1ads.c index 30f04e56fafe..a39433afb512 100644 --- a/trunk/arch/arm/mach-mx1/mx1ads.c +++ b/trunk/arch/arm/mach-mx1/mach-mx1ads.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-imx/mx1ads.c + * arch/arm/mach-imx/mach-mx1ads.c * * Initially based on: * linux-2.6.7-imx/arch/arm/mach-imx/scb9328.c diff --git a/trunk/arch/arm/mach-mx1/scb9328.c b/trunk/arch/arm/mach-mx1/mach-scb9328.c similarity index 98% rename from trunk/arch/arm/mach-mx1/scb9328.c rename to trunk/arch/arm/mach-mx1/mach-scb9328.c index 325d98df6053..b9530d76e99d 100644 --- a/trunk/arch/arm/mach-mx1/scb9328.c +++ b/trunk/arch/arm/mach-mx1/mach-scb9328.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-mx1/scb9328.c + * linux/arch/arm/mach-mx1/mach-scb9328.c * * Copyright (c) 2004 Sascha Hauer * Copyright (c) 2006-2008 Juergen Beisert