diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig (renamed from arch/arm/mach-mx2/Kconfig) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/Makefile (renamed from arch/arm/mach-mx2/Makefile) | 6 | ||||
-rw-r--r-- | arch/arm/mach-imx/Makefile.boot (renamed from arch/arm/mach-mx2/Makefile.boot) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/clock-imx21.c (renamed from arch/arm/mach-mx2/clock_imx21.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/clock-imx27.c (renamed from arch/arm/mach-mx2/clock_imx27.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/cpu-imx27.c (renamed from arch/arm/mach-mx2/cpu_imx27.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/devices.c (renamed from arch/arm/mach-mx2/devices.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/devices.h (renamed from arch/arm/mach-mx2/devices.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/eukrea_mbimx27-baseboard.c (renamed from arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c (renamed from arch/arm/mach-mx2/mach-cpuimx27.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx27lite.c (renamed from arch/arm/mach-mx2/mach-imx27lite.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx21ads.c (renamed from arch/arm/mach-mx2/mach-mx21ads.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx27_3ds.c (renamed from arch/arm/mach-mx2/mach-mx27_3ds.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx27ads.c (renamed from arch/arm/mach-mx2/mach-mx27ads.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mxt_td60.c (renamed from arch/arm/mach-mx2/mach-mxt_td60.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pca100.c (renamed from arch/arm/mach-mx2/mach-pca100.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c (renamed from arch/arm/mach-mx2/mach-pcm038.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mm-imx21.c (renamed from arch/arm/mach-mx2/mm-imx21.c) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mm-imx27.c (renamed from arch/arm/mach-mx2/mm-imx27.c) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/pcm970-baseboard.c (renamed from arch/arm/mach-mx2/pcm970-baseboard.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/serial.c (renamed from arch/arm/mach-mx2/serial.c) | 0 | ||||
-rw-r--r-- | arch/arm/plat-mxc/Kconfig | 2 |
23 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 64ba313724d2..c60d604b2ef4 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -146,7 +146,7 @@ machine-$(CONFIG_ARCH_MMP) := mmp | |||
146 | machine-$(CONFIG_ARCH_MSM) := msm | 146 | machine-$(CONFIG_ARCH_MSM) := msm |
147 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 147 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
148 | machine-$(CONFIG_ARCH_MX1) := mx1 | 148 | machine-$(CONFIG_ARCH_MX1) := mx1 |
149 | machine-$(CONFIG_ARCH_MX2) := mx2 | 149 | machine-$(CONFIG_ARCH_MX2) := imx |
150 | machine-$(CONFIG_ARCH_MX25) := mx25 | 150 | machine-$(CONFIG_ARCH_MX25) := mx25 |
151 | machine-$(CONFIG_ARCH_MX3) := mx3 | 151 | machine-$(CONFIG_ARCH_MX3) := mx3 |
152 | machine-$(CONFIG_ARCH_MX5) := mx5 | 152 | machine-$(CONFIG_ARCH_MX5) := mx5 |
diff --git a/arch/arm/mach-mx2/Kconfig b/arch/arm/mach-imx/Kconfig index 742fd4e6dcb9..742fd4e6dcb9 100644 --- a/arch/arm/mach-mx2/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
diff --git a/arch/arm/mach-mx2/Makefile b/arch/arm/mach-imx/Makefile index e3254faac828..068f4937debd 100644 --- a/arch/arm/mach-mx2/Makefile +++ b/arch/arm/mach-imx/Makefile | |||
@@ -6,10 +6,10 @@ | |||
6 | 6 | ||
7 | obj-y := devices.o serial.o | 7 | obj-y := devices.o serial.o |
8 | 8 | ||
9 | obj-$(CONFIG_MACH_MX21) += clock_imx21.o mm-imx21.o | 9 | obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o |
10 | 10 | ||
11 | obj-$(CONFIG_MACH_MX27) += cpu_imx27.o | 11 | obj-$(CONFIG_MACH_MX27) += cpu-imx27.o |
12 | obj-$(CONFIG_MACH_MX27) += clock_imx27.o mm-imx27.o | 12 | obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o |
13 | 13 | ||
14 | obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o | 14 | obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o |
15 | obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o | 15 | obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o |
diff --git a/arch/arm/mach-mx2/Makefile.boot b/arch/arm/mach-imx/Makefile.boot index e867398a8fdb..e867398a8fdb 100644 --- a/arch/arm/mach-mx2/Makefile.boot +++ b/arch/arm/mach-imx/Makefile.boot | |||
diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-imx/clock-imx21.c index bb419ef4d133..bb419ef4d133 100644 --- a/arch/arm/mach-mx2/clock_imx21.c +++ b/arch/arm/mach-imx/clock-imx21.c | |||
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-imx/clock-imx27.c index 0f0823c8b170..0f0823c8b170 100644 --- a/arch/arm/mach-mx2/clock_imx27.c +++ b/arch/arm/mach-imx/clock-imx27.c | |||
diff --git a/arch/arm/mach-mx2/cpu_imx27.c b/arch/arm/mach-imx/cpu-imx27.c index d8d3b2d84dc5..d8d3b2d84dc5 100644 --- a/arch/arm/mach-mx2/cpu_imx27.c +++ b/arch/arm/mach-imx/cpu-imx27.c | |||
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-imx/devices.c index a0aeb8a4adc1..a0aeb8a4adc1 100644 --- a/arch/arm/mach-mx2/devices.c +++ b/arch/arm/mach-imx/devices.c | |||
diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-imx/devices.h index 84ed51380174..84ed51380174 100644 --- a/arch/arm/mach-mx2/devices.h +++ b/arch/arm/mach-imx/devices.h | |||
diff --git a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c index f3b169d5245f..f3b169d5245f 100644 --- a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | |||
diff --git a/arch/arm/mach-mx2/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 1f616dcaabc9..1f616dcaabc9 100644 --- a/arch/arm/mach-mx2/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
diff --git a/arch/arm/mach-mx2/mach-imx27lite.c b/arch/arm/mach-imx/mach-imx27lite.c index fd1dddb8cad5..fd1dddb8cad5 100644 --- a/arch/arm/mach-mx2/mach-imx27lite.c +++ b/arch/arm/mach-imx/mach-imx27lite.c | |||
diff --git a/arch/arm/mach-mx2/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c index 99f2492991b4..99f2492991b4 100644 --- a/arch/arm/mach-mx2/mach-mx21ads.c +++ b/arch/arm/mach-imx/mach-mx21ads.c | |||
diff --git a/arch/arm/mach-mx2/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index a45df59ca72b..a45df59ca72b 100644 --- a/arch/arm/mach-mx2/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c | |||
diff --git a/arch/arm/mach-mx2/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c index 2183e3d4875a..2183e3d4875a 100644 --- a/arch/arm/mach-mx2/mach-mx27ads.c +++ b/arch/arm/mach-imx/mach-mx27ads.c | |||
diff --git a/arch/arm/mach-mx2/mach-mxt_td60.c b/arch/arm/mach-imx/mach-mxt_td60.c index bc3855992677..bc3855992677 100644 --- a/arch/arm/mach-mx2/mach-mxt_td60.c +++ b/arch/arm/mach-imx/mach-mxt_td60.c | |||
diff --git a/arch/arm/mach-mx2/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index a87422ed4ff5..a87422ed4ff5 100644 --- a/arch/arm/mach-mx2/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
diff --git a/arch/arm/mach-mx2/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 36c89431679a..36c89431679a 100644 --- a/arch/arm/mach-mx2/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
diff --git a/arch/arm/mach-mx2/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c index 64134314d012..115c21289125 100644 --- a/arch/arm/mach-mx2/mm-imx21.c +++ b/arch/arm/mach-imx/mm-imx21.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/arm/mach-mx2/mm-imx21.c | 2 | * arch/arm/mach-imx/mm-imx21.c |
3 | * | 3 | * |
4 | * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de) | 4 | * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de) |
5 | * | 5 | * |
diff --git a/arch/arm/mach-mx2/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c index 3366ed44cfd5..89b41749e166 100644 --- a/arch/arm/mach-mx2/mm-imx27.c +++ b/arch/arm/mach-imx/mm-imx27.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/arm/mach-mx2/mm-imx27.c | 2 | * arch/arm/mach-imx/mm-imx27.c |
3 | * | 3 | * |
4 | * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de) | 4 | * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de) |
5 | * | 5 | * |
diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-imx/pcm970-baseboard.c index f490a406d57e..f490a406d57e 100644 --- a/arch/arm/mach-mx2/pcm970-baseboard.c +++ b/arch/arm/mach-imx/pcm970-baseboard.c | |||
diff --git a/arch/arm/mach-mx2/serial.c b/arch/arm/mach-imx/serial.c index 1c0c835b2252..1c0c835b2252 100644 --- a/arch/arm/mach-mx2/serial.c +++ b/arch/arm/mach-imx/serial.c | |||
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 7f7ad6f289bd..4974fcc06735 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig | |||
@@ -49,7 +49,7 @@ config ARCH_MX5 | |||
49 | endchoice | 49 | endchoice |
50 | 50 | ||
51 | source "arch/arm/mach-mx1/Kconfig" | 51 | source "arch/arm/mach-mx1/Kconfig" |
52 | source "arch/arm/mach-mx2/Kconfig" | 52 | source "arch/arm/mach-imx/Kconfig" |
53 | source "arch/arm/mach-mx3/Kconfig" | 53 | source "arch/arm/mach-mx3/Kconfig" |
54 | source "arch/arm/mach-mx25/Kconfig" | 54 | source "arch/arm/mach-mx25/Kconfig" |
55 | source "arch/arm/mach-mxc91231/Kconfig" | 55 | source "arch/arm/mach-mxc91231/Kconfig" |