diff --git a/[refs] b/[refs]
index c970de457feb..64b6936ceb53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2724426924a471dc9fd8989dae56ab4d79519e34
+refs/heads/master: af711cda4f94b5fddcdc5eb4134387ae026e3171
diff --git a/trunk/arch/x86/xen/Makefile b/trunk/arch/x86/xen/Makefile
index 343df246bd3e..c5e9aa489900 100644
--- a/trunk/arch/x86/xen/Makefile
+++ b/trunk/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/trunk/drivers/xen/Makefile b/trunk/drivers/xen/Makefile
index 56592f0d6cef..609fdda90a34 100644
--- a/trunk/drivers/xen/Makefile
+++ b/trunk/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/trunk/arch/x86/xen/features.c b/trunk/drivers/xen/features.c
similarity index 100%
rename from trunk/arch/x86/xen/features.c
rename to trunk/drivers/xen/features.c