diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index b47f5da674d3c1ca8dbf7312adb364ba09d87b45..b978645517184930ce3b80d8d043a0f596664519 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -1,9 +1,10 @@
-obj-y	+= grant-table.o features.o events.o manage.o biomerge.o
+obj-y	+= grant-table.o features.o events.o manage.o
 obj-y	+= xenbus/
 
 nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_features.o			:= $(nostackp)
 
+obj-$(CONFIG_BLOCK)		+= biomerge.o
 obj-$(CONFIG_HOTPLUG_CPU)	+= cpu_hotplug.o
 obj-$(CONFIG_XEN_XENCOMM)	+= xencomm.o
 obj-$(CONFIG_XEN_BALLOON)	+= balloon.o