diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 19:48:07 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 10:02:19 +0800 |
| commit | 3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (patch) | |
| tree | b1c04b25317c9dade08d911e8077c8745df8a954 /arch/arm/plat-mxc/Makefile | |
| parent | e0557c0d1a3a9c38af6777d308f98da12c94e137 (diff) | |
| download | lwn-3995eb82050a81e11217a0b88b2a5eddd53eb4d6.tar.gz lwn-3995eb82050a81e11217a0b88b2a5eddd53eb4d6.zip | |
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/plat-mxc/Makefile')
| -rw-r--r-- | arch/arm/plat-mxc/Makefile | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile deleted file mode 100644 index e33d2d139ba1..000000000000 --- a/arch/arm/plat-mxc/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# -# Makefile for the linux kernel. -# - -# Common support -obj-y := time.o cpu.o system.o irq-common.o - -obj-$(CONFIG_MXC_TZIC) += tzic.o -obj-$(CONFIG_MXC_AVIC) += avic.o - -obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o -obj-$(CONFIG_MXC_ULPI) += ulpi.o -obj-$(CONFIG_MXC_USE_EPIT) += epit.o -obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o -obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o -obj-$(CONFIG_CPU_IDLE) += cpuidle.o -ifdef CONFIG_SND_IMX_SOC -obj-y += ssi-fiq.o -obj-y += ssi-fiq-ksym.o -endif |