Merge branch 'master' into for-next

[~andy/linux] / drivers / block / Makefile

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 8cc98cd0d4a8578485694e95735af1fd25514bff..816d979c32667f9549b7ef313f38f386b8790705 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -31,7 +31,6 @@ obj-$(CONFIG_BLK_DEV_NBD)     += nbd.o
 obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o
 obj-$(CONFIG_VIRTIO_BLK)       += virtio_blk.o
 
-obj-$(CONFIG_VIODASD)          += viodasd.o
 obj-$(CONFIG_BLK_DEV_SX8)      += sx8.o
 obj-$(CONFIG_BLK_DEV_HD)       += hd.o