From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934584Ab3CZOlb (ORCPT ); Tue, 26 Mar 2013 10:41:31 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:63453 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934533Ab3CZOl0 (ORCPT ); Tue, 26 Mar 2013 10:41:26 -0400 X-IronPort-AV: E=Sophos;i="4.84,911,1355097600"; d="scan'208";a="14895952" From: Stefano Stabellini To: CC: , , , , , Stefano Stabellini , , , Subject: [PATCH v2 3/6] xen: move the xenvm machine to mach-virt Date: Tue, 26 Mar 2013 14:41:12 +0000 Message-ID: <1364308875-26484-3-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm/mach-vexpress/v2m.c | 1 - arch/arm/mach-virt/virt.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 915683c..c43ec78 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 31666f6..528c05e 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 }; -- 1.7.2.5