From 04f7e5249159c8e458d653f083efabb5fce2a13e Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Mon, 26 May 2008 23:31:13 +0100 Subject: [PATCH] --- yaml --- r: 99545 b: refs/heads/master c: ec9b2065d4d3b797604c09a569083dd9ff951b1b h: refs/heads/master i: 99543: fec1c195af18780f551a4b6f7bfaf718e21f812a v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/Makefile | 2 +- trunk/drivers/xen/Makefile | 2 +- trunk/{arch/x86 => drivers}/xen/manage.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/{arch/x86 => drivers}/xen/manage.c (100%) diff --git a/[refs] b/[refs] index 693ee74c340a..10cb2556a7db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83abc70a4c6e306f4c1672e25884322f797e4fcb +refs/heads/master: ec9b2065d4d3b797604c09a569083dd9ff951b1b diff --git a/trunk/arch/x86/xen/Makefile b/trunk/arch/x86/xen/Makefile index 3d8df981d5fd..40b119b6b103 100644 --- a/trunk/arch/x86/xen/Makefile +++ b/trunk/arch/x86/xen/Makefile @@ -1,4 +1,4 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o \ - time.o manage.o xen-asm.o grant-table.o + time.o xen-asm.o grant-table.o obj-$(CONFIG_SMP) += smp.o diff --git a/trunk/drivers/xen/Makefile b/trunk/drivers/xen/Makefile index 37af04f1ffd9..363286c54290 100644 --- a/trunk/drivers/xen/Makefile +++ b/trunk/drivers/xen/Makefile @@ -1,4 +1,4 @@ -obj-y += grant-table.o features.o events.o +obj-y += grant-table.o features.o events.o manage.o obj-y += xenbus/ obj-$(CONFIG_XEN_XENCOMM) += xencomm.o obj-$(CONFIG_XEN_BALLOON) += balloon.o diff --git a/trunk/arch/x86/xen/manage.c b/trunk/drivers/xen/manage.c similarity index 100% rename from trunk/arch/x86/xen/manage.c rename to trunk/drivers/xen/manage.c