diff --git a/[refs] b/[refs]
index 440f22108fd4..eef5e778e497 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 772aebcefeff310f80e32b874988af0076cb799d
+refs/heads/master: 6bf926ddd44ddc67edbeb28d4069f207f2c6e07e
diff --git a/trunk/drivers/xen/Makefile b/trunk/drivers/xen/Makefile
index 46de6cdfccb3..74354708c6c4 100644
--- a/trunk/drivers/xen/Makefile
+++ b/trunk/drivers/xen/Makefile
@@ -2,7 +2,8 @@ ifneq ($(CONFIG_ARM),y)
 obj-y	+= manage.o balloon.o
 obj-$(CONFIG_HOTPLUG_CPU)		+= cpu_hotplug.o
 endif
-obj-y	+= grant-table.o features.o events.o fallback.o
+obj-$(CONFIG_X86)			+= fallback.o
+obj-y	+= grant-table.o features.o events.o
 obj-y	+= xenbus/
 
 nostackp := $(call cc-option, -fno-stack-protector)