summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2008-04-02 10:53:54 -0700
committerIngo Molnar <mingo@elte.hu>2008-04-24 23:57:32 +0200
commitaf711cda4f94b5fddcdc5eb4134387ae026e3171 (patch)
tree291b77deb0ad3f6fe83e8f77d8b0cfd553d07924
parent2724426924a471dc9fd8989dae56ab4d79519e34 (diff)
downloadop-kernel-dev-af711cda4f94b5fddcdc5eb4134387ae026e3171.zip
op-kernel-dev-af711cda4f94b5fddcdc5eb4134387ae026e3171.tar.gz
xen: move features.c from arch/x86/xen/features.c to drivers/xen
ia64/xen also uses it too. Move it into common place so that ia64/xen can share the code. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/xen/Makefile2
-rw-r--r--drivers/xen/Makefile2
-rw-r--r--drivers/xen/features.c (renamed from arch/x86/xen/features.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 343df24..c5e9aa4 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -1,4 +1,4 @@
-obj-y := enlighten.o setup.o features.o multicalls.o mmu.o \
+obj-y := enlighten.o setup.o multicalls.o mmu.o \
events.o time.o manage.o xen-asm.o
obj-$(CONFIG_SMP) += smp.o
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 56592f0..609fdda 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -1,2 +1,2 @@
-obj-y += grant-table.o
+obj-y += grant-table.o features.o
obj-y += xenbus/
diff --git a/arch/x86/xen/features.c b/drivers/xen/features.c
index 0707714..0707714 100644
--- a/arch/x86/xen/features.c
+++ b/drivers/xen/features.c
OpenPOWER on IntegriCloud