From: Stefano Stabellini Date: Fri, 22 Mar 2013 12:54:20 +0000 (+0000) Subject: xen: move the xenvm machine to mach-virt X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1e1ef8cb61306d06c025b356c8843309c44a62cb;p=people%2Fsstabellini%2Flinux-pvhvm-deprecated.git xen: move the xenvm machine to mach-virt xenvm is based on mach-vexpress, move it to mach-virt. Signed-off-by: Stefano Stabellini Acked-by: Marc Zyngier 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 915683cb67d..c43ec789661 100644 --- 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 31666f6b437..528c05eab3a 100644 --- 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 };