---

yaml --- r: 187494 b: refs/heads/master c: 95c0046 h: refs/heads/master v: v3
git-mirror · Jan 5, 2010 · 2cb4f79 · 2cb4f79
1 parent 7cced97
commit 2cb4f79
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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 → trunk/arch/arm/mach-mx1/mach-mx1ads.c b/trunk/arch/arm/mach-mx1/mx1ads.c → 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 → trunk/arch/arm/mach-mx1/mach-scb9328.c b/trunk/arch/arm/mach-mx1/scb9328.c → 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 <saschahauer@web.de>
  * Copyright (c) 2006-2008 Juergen Beisert <jbeisert@netscape.net>