xen: move the xenvm machine to mach-virt

xenvm is based on mach-vexpress, move it to mach-virt.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: marc.zyngier@arm.com
CC: will.deacon@arm.com
CC: arnd@arndb.de
CC: rob.herring@calxeda.com

diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 915683cb67d60a6eed062fa49cbc7781a11f761b..c43ec789661da4a9a18b63fabf4dd847f0c7f799 100644 (file)
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -469,7 +469,6 @@ static void __init v2m_dt_init(void)
 
 static const char * const v2m_dt_match[] __initconst = {
        "arm,vexpress",
-       "xen,xenvm",
        NULL,
 };
 

diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c
index 31666f6b43736fca58ebebaa7cb4d02562b6c25a..528c05eab3a7bcdc0a353f1675cefaeea9f16e73 100644 (file)
--- a/arch/arm/mach-virt/virt.c
+++ b/arch/arm/mach-virt/virt.c
@@ -40,6 +40,7 @@ static void __init virt_timer_init(void)
 
 static const char *virt_dt_match[] = {
        "linux,dummy-virt",
+       "xen,xenvm",
        NULL
 };