---

yaml --- r: 201613 b: refs/heads/master c: d109167 h: refs/heads/master i: 201611: 8da43a3 v: v3
git-mirror · Jun 24, 2010 · 5280489 · 5280489
1 parent 4268479
commit 5280489
Show file tree

Hide file tree

Showing 24 changed files with 8 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1d4cbef18999548ade1007bfb63cc1fa69c385e
+refs/heads/master: d109167b9c1002770d194644d5580a1f3588f7fc
diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile
@@ -146,7 +146,7 @@ machine-$(CONFIG_ARCH_MMP)		:= mmp
 machine-$(CONFIG_ARCH_MSM)		:= msm
 machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0
 machine-$(CONFIG_ARCH_MX1)		:= mx1
-machine-$(CONFIG_ARCH_MX2)		:= mx2
+machine-$(CONFIG_ARCH_MX2)		:= imx
 machine-$(CONFIG_ARCH_MX25)		:= mx25
 machine-$(CONFIG_ARCH_MX3)		:= mx3
 machine-$(CONFIG_ARCH_MX5)		:= mx5

diff --git a/trunk/arch/arm/mach-mx2/Kconfig → trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-mx2/Kconfig → trunk/arch/arm/mach-imx/Kconfig
diff --git a/trunk/arch/arm/mach-mx2/Makefile → trunk/arch/arm/mach-imx/Makefile b/trunk/arch/arm/mach-mx2/Makefile → trunk/arch/arm/mach-imx/Makefile
@@ -6,10 +6,10 @@
 
 obj-y	:=  devices.o serial.o
 
-obj-$(CONFIG_MACH_MX21) += clock_imx21.o mm-imx21.o
+obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o
 
-obj-$(CONFIG_MACH_MX27) += cpu_imx27.o
-obj-$(CONFIG_MACH_MX27) += clock_imx27.o mm-imx27.o
+obj-$(CONFIG_MACH_MX27) += cpu-imx27.o
+obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o
 
 obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
 obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o

diff --git a/trunk/arch/arm/mach-mx2/Makefile.boot → trunk/arch/arm/mach-imx/Makefile.boot b/trunk/arch/arm/mach-mx2/Makefile.boot → trunk/arch/arm/mach-imx/Makefile.boot
diff --git a/trunk/arch/arm/mach-mx2/clock_imx21.c → trunk/arch/arm/mach-imx/clock-imx21.c b/trunk/arch/arm/mach-mx2/clock_imx21.c → trunk/arch/arm/mach-imx/clock-imx21.c
diff --git a/trunk/arch/arm/mach-mx2/clock_imx27.c → trunk/arch/arm/mach-imx/clock-imx27.c b/trunk/arch/arm/mach-mx2/clock_imx27.c → trunk/arch/arm/mach-imx/clock-imx27.c
diff --git a/trunk/arch/arm/mach-mx2/cpu_imx27.c → trunk/arch/arm/mach-imx/cpu-imx27.c b/trunk/arch/arm/mach-mx2/cpu_imx27.c → trunk/arch/arm/mach-imx/cpu-imx27.c
diff --git a/trunk/arch/arm/mach-mx2/devices.c → trunk/arch/arm/mach-imx/devices.c b/trunk/arch/arm/mach-mx2/devices.c → trunk/arch/arm/mach-imx/devices.c
diff --git a/trunk/arch/arm/mach-mx2/devices.h → trunk/arch/arm/mach-imx/devices.h b/trunk/arch/arm/mach-mx2/devices.h → trunk/arch/arm/mach-imx/devices.h
diff --git a/...h/arm/mach-mx2/eukrea_mbimx27-baseboard.c → ...h/arm/mach-imx/eukrea_mbimx27-baseboard.c b/...h/arm/mach-mx2/eukrea_mbimx27-baseboard.c → ...h/arm/mach-imx/eukrea_mbimx27-baseboard.c
diff --git a/trunk/arch/arm/mach-mx2/mach-cpuimx27.c → trunk/arch/arm/mach-imx/mach-cpuimx27.c b/trunk/arch/arm/mach-mx2/mach-cpuimx27.c → trunk/arch/arm/mach-imx/mach-cpuimx27.c
diff --git a/trunk/arch/arm/mach-mx2/mach-imx27lite.c → trunk/arch/arm/mach-imx/mach-imx27lite.c b/trunk/arch/arm/mach-mx2/mach-imx27lite.c → trunk/arch/arm/mach-imx/mach-imx27lite.c
diff --git a/trunk/arch/arm/mach-mx2/mach-mx21ads.c → trunk/arch/arm/mach-imx/mach-mx21ads.c b/trunk/arch/arm/mach-mx2/mach-mx21ads.c → trunk/arch/arm/mach-imx/mach-mx21ads.c
diff --git a/trunk/arch/arm/mach-mx2/mach-mx27_3ds.c → trunk/arch/arm/mach-imx/mach-mx27_3ds.c b/trunk/arch/arm/mach-mx2/mach-mx27_3ds.c → trunk/arch/arm/mach-imx/mach-mx27_3ds.c
diff --git a/trunk/arch/arm/mach-mx2/mach-mx27ads.c → trunk/arch/arm/mach-imx/mach-mx27ads.c b/trunk/arch/arm/mach-mx2/mach-mx27ads.c → trunk/arch/arm/mach-imx/mach-mx27ads.c
diff --git a/trunk/arch/arm/mach-mx2/mach-mxt_td60.c → trunk/arch/arm/mach-imx/mach-mxt_td60.c b/trunk/arch/arm/mach-mx2/mach-mxt_td60.c → trunk/arch/arm/mach-imx/mach-mxt_td60.c
diff --git a/trunk/arch/arm/mach-mx2/mach-pca100.c → trunk/arch/arm/mach-imx/mach-pca100.c b/trunk/arch/arm/mach-mx2/mach-pca100.c → trunk/arch/arm/mach-imx/mach-pca100.c
diff --git a/trunk/arch/arm/mach-mx2/mach-pcm038.c → trunk/arch/arm/mach-imx/mach-pcm038.c b/trunk/arch/arm/mach-mx2/mach-pcm038.c → trunk/arch/arm/mach-imx/mach-pcm038.c
diff --git a/trunk/arch/arm/mach-mx2/mm-imx21.c → trunk/arch/arm/mach-imx/mm-imx21.c b/trunk/arch/arm/mach-mx2/mm-imx21.c → trunk/arch/arm/mach-imx/mm-imx21.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-mx2/mm-imx21.c
+ * arch/arm/mach-imx/mm-imx21.c
  *
  * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
  *

diff --git a/trunk/arch/arm/mach-mx2/mm-imx27.c → trunk/arch/arm/mach-imx/mm-imx27.c b/trunk/arch/arm/mach-mx2/mm-imx27.c → trunk/arch/arm/mach-imx/mm-imx27.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-mx2/mm-imx27.c
+ * arch/arm/mach-imx/mm-imx27.c
  *
  * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
  *

diff --git a/trunk/arch/arm/mach-mx2/pcm970-baseboard.c → trunk/arch/arm/mach-imx/pcm970-baseboard.c b/trunk/arch/arm/mach-mx2/pcm970-baseboard.c → trunk/arch/arm/mach-imx/pcm970-baseboard.c
diff --git a/trunk/arch/arm/mach-mx2/serial.c → trunk/arch/arm/mach-imx/serial.c b/trunk/arch/arm/mach-mx2/serial.c → trunk/arch/arm/mach-imx/serial.c
diff --git a/trunk/arch/arm/plat-mxc/Kconfig b/trunk/arch/arm/plat-mxc/Kconfig
@@ -49,7 +49,7 @@ config ARCH_MX5
 endchoice
 
 source "arch/arm/mach-mx1/Kconfig"
-source "arch/arm/mach-mx2/Kconfig"
+source "arch/arm/mach-imx/Kconfig"
 source "arch/arm/mach-mx3/Kconfig"
 source "arch/arm/mach-mx25/Kconfig"
 source "arch/arm/mach-mxc91231/Kconfig"