Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / block / Makefile

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index aff5ac925c34332f235e523164f7f85cd76b6751..76646e9a1c91528617c22e2c3f429201531acdf4 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -36,6 +36,8 @@ obj-$(CONFIG_BLK_DEV_UB)      += ub.o
 obj-$(CONFIG_BLK_DEV_HD)       += hd.o
 
 obj-$(CONFIG_XEN_BLKDEV_FRONTEND)      += xen-blkfront.o
+obj-$(CONFIG_XEN_BLKDEV_BACKEND)       += xen-blkback/
 obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/
+obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o
 
-swim_mod-objs  := swim.o swim_asm.o
+swim_mod-y     := swim.o swim_asm.o