diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 07:48:07 -0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-14 22:02:19 -0400 |
| commit | 3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (patch) | |
| tree | b1c04b25317c9dade08d911e8077c8745df8a954 /arch/arm/Kconfig | |
| parent | e0557c0d1a3a9c38af6777d308f98da12c94e137 (diff) | |
ARM: imx: merge plat-mxc into mach-imx
It's really unnecessary to have plat-mxc, and let's merge it into
mach-imx. It's pretty much just a bunch of file renaming and
Kconfig/Makefile merge.
To make the change less invasive, we keep using Kconfig symbol
CONFIG_ARCH_MXC for mach-imx sub-architecture.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 73067efd4845..bffd47a3855c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1058,7 +1058,7 @@ source "arch/arm/mach-msm/Kconfig" | |||
| 1058 | 1058 | ||
| 1059 | source "arch/arm/mach-mv78xx0/Kconfig" | 1059 | source "arch/arm/mach-mv78xx0/Kconfig" |
| 1060 | 1060 | ||
| 1061 | source "arch/arm/plat-mxc/Kconfig" | 1061 | source "arch/arm/mach-imx/Kconfig" |
| 1062 | 1062 | ||
| 1063 | source "arch/arm/mach-mxs/Kconfig" | 1063 | source "arch/arm/mach-mxs/Kconfig" |
| 1064 | 1064 | ||