diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
commit | 3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4 (patch) | |
tree | 7d729e347d8860c9ef5631cb8cdfa96e892f86d5 /arch/arm/Makefile | |
parent | a990cbd887585a1056b927b3b20de325f14fdf96 (diff) | |
parent | 3d64b4496f5fd90618106555344205a522178c0c (diff) | |
download | linux-3.10-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.tar.gz linux-3.10-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.tar.bz2 linux-3.10-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.zip |
Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1d693d06257..054a8766784 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -197,6 +197,7 @@ machine-$(CONFIG_MACH_SPEAR300) := spear3xx machine-$(CONFIG_MACH_SPEAR310) := spear3xx machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx +machine-$(CONFIG_ARCH_ZYNQ) := zynq # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. @@ -204,6 +205,7 @@ plat-$(CONFIG_ARCH_MXC) := mxc plat-$(CONFIG_ARCH_OMAP) := omap plat-$(CONFIG_ARCH_S3C64XX) := samsung plat-$(CONFIG_ARCH_TCC_926) := tcc +plat-$(CONFIG_ARCH_ZYNQ) := versatile plat-$(CONFIG_PLAT_IOP) := iop plat-$(CONFIG_PLAT_NOMADIK) := nomadik plat-$(CONFIG_PLAT_ORION) := orion |