aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2010-10-20 13:04:13 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2010-10-20 13:04:13 -0400
commit2d7d06dd8ffcbafc03bf2c1cb4b2fb2c4c405ec1 (patch)
treeeb1e873af41ecd2bcc8b1036b0a16b3e846c17e4
parent31f9783f48388aacf7f791d607b16d36e63a2b79 (diff)
downloadmrst-s0i3-test-2d7d06dd8ffcbafc03bf2c1cb4b2fb2c4c405ec1.tar.gz
mrst-s0i3-test-2d7d06dd8ffcbafc03bf2c1cb4b2fb2c4c405ec1.tar.xz
mrst-s0i3-test-2d7d06dd8ffcbafc03bf2c1cb4b2fb2c4c405ec1.zip
xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c
Without this dependency we get these compile errors: linux-next-20101020/drivers/xen/biomerge.c: In function 'xen_biovec_phys_mergeable': linux-next-20101020/drivers/xen/biomerge.c:8: error: dereferencing pointer to incomplete type linux-next-20101020/drivers/xen/biomerge.c:9: error: dereferencing pointer to incomplete type linux-next-20101020/drivers/xen/biomerge.c:11: error: implicit declaration of function '__BIOVEC_PHYS_MERGEABLE' Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
-rw-r--r--drivers/xen/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index b47f5da674d..b9786455171 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