summaryrefslogtreecommitdiff
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-11 09:21:51 -0800
committerOlof Johansson <olof@lixom.net>2013-02-11 09:22:09 -0800
commit28e783aacba4b27793ed8032925d90ae5e0dd7ac (patch)
treef2de00a55f97eda33c58251c7f46a793ad691d85 /arch/arm/Makefile
parent5f48a29f1721736930b7817b430039c1d348dd05 (diff)
parent4de3abb348d7a5bd6ddbfc26c34e0ee549874249 (diff)
Merge branch 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/virt
From Will Deacon, this lays the foundation for a basic virtualzed machine type. * 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux: ARM: mach-virt: add SMP support using PSCI ARM: Dummy Virtual Machine platform support Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 4bcd2d6b0535..3b82b36eec3f 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -194,6 +194,7 @@ machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
machine-$(CONFIG_ARCH_SPEAR13XX) += spear13xx
machine-$(CONFIG_ARCH_SPEAR3XX) += spear3xx
machine-$(CONFIG_MACH_SPEAR600) += spear6xx
+machine-$(CONFIG_ARCH_VIRT) += virt
machine-$(CONFIG_ARCH_ZYNQ) += zynq
machine-$(CONFIG_ARCH_SUNXI) += sunxi