---

yaml --- r: 335551 b: refs/heads/master c: 6bf926d h: refs/heads/master i: 335549: c5fcb53 335547: 021f687 335543: bfb6c68 335535: 45fe651 335519: d86c691 335487: 4144d20 v: v3
git-mirror · Nov 7, 2012 · 4774673 · 4774673
1 parent b276400
commit 4774673
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)