diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 10:21:27 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 10:21:27 -0500 |
| commit | 89a4150331bc07014256714678ce8e9b238fc145 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /arch/arm/Makefile | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
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 | |||
| 196 | 196 | ||
| 197 | # Platform directory name. This list is sorted alphanumerically | 197 | # Platform directory name. This list is sorted alphanumerically |
| 198 | # by CONFIG_* macro name. | 198 | # by CONFIG_* macro name. |
| 199 | plat-$(CONFIG_ARCH_MXC) += mxc | ||
| 200 | plat-$(CONFIG_ARCH_OMAP) += omap | 199 | plat-$(CONFIG_ARCH_OMAP) += omap |
| 201 | plat-$(CONFIG_ARCH_S3C64XX) += samsung | 200 | plat-$(CONFIG_ARCH_S3C64XX) += samsung |
| 202 | plat-$(CONFIG_ARCH_ZYNQ) += versatile | 201 | plat-$(CONFIG_ARCH_ZYNQ) += versatile |