diff options
| author | Sascha Hauer | 2012-11-16 16:21:27 +0100 |
|---|---|---|
| committer | Sascha Hauer | 2012-11-16 16:21:27 +0100 |
| commit | 89a4150331bc07014256714678ce8e9b238fc145 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /arch/arm/Makefile | |
| parent | Linux 3.7-rc5 (diff) | |
| parent | ARM: imx: select HAVE_IMX_SRC when SMP is enabled (diff) | |
| download | kernel-qcow2-linux-89a4150331bc07014256714678ce8e9b238fc145.tar.gz kernel-qcow2-linux-89a4150331bc07014256714678ce8e9b238fc145.tar.xz kernel-qcow2-linux-89a4150331bc07014256714678ce8e9b238fc145.zip | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5f914fca911b..3353b7613208 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -196,7 +196,6 @@ machine-$(CONFIG_ARCH_ZYNQ) += zynq # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -plat-$(CONFIG_ARCH_MXC) += mxc plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(CONFIG_ARCH_ZYNQ) += versatile |