diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2010-10-20 19:04:13 +0200 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2010-10-20 19:04:13 +0200 |
| commit | 2d7d06dd8ffcbafc03bf2c1cb4b2fb2c4c405ec1 (patch) | |
| tree | eb1e873af41ecd2bcc8b1036b0a16b3e846c17e4 /drivers/xen | |
| parent | MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright. (diff) | |
| download | linux-2d7d06dd8ffcbafc03bf2c1cb4b2fb2c4c405ec1.tar.xz linux-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>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index b47f5da674d3..b97864551718 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 |