summaryrefslogtreecommitdiffstats
path: root/fs/Makefile
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-05-19 16:16:41 +0200
committerJens Axboe <axboe@fb.com>2014-05-19 16:34:46 +0200
commitf9c78b2be2cac2a7a397d489275e7d9f9ae785f2 (patch)
treefde918d944e61dc87cc89a71bec7e886832b1829 /fs/Makefile
parentMerge branch 'for-3.16/blk-mq-tagging' into for-3.16/core (diff)
downloadlinux-f9c78b2be2cac2a7a397d489275e7d9f9ae785f2.tar.xz
linux-f9c78b2be2cac2a7a397d489275e7d9f9ae785f2.zip
block: move bio.c and bio-integrity.c from fs/ to block/
They really belong in block/, especially now since it's not in drivers/block/ anymore. Additionally, the get_maintainer script gets it wrong when in fs/. Suggested-by: Christoph Hellwig <hch@infradead.org> Acked-by: Al Viro <viro@ZenIV.linux.org.uk> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/Makefile')
-rw-r--r--fs/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/Makefile b/fs/Makefile
index f9cb9876e466..1ed9eab5e0a9 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -14,14 +14,13 @@ obj-y := open.o read_write.o file_table.o super.o \
stack.o fs_struct.o statfs.o
ifeq ($(CONFIG_BLOCK),y)
-obj-y += buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
+obj-y += buffer.o block_dev.o direct-io.o mpage.o ioprio.o
else
obj-y += no-block.o
endif
obj-$(CONFIG_PROC_FS) += proc_namespace.o
-obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o
obj-y += notify/
obj-$(CONFIG_EPOLL) += eventpoll.o
obj-$(CONFIG_ANON_INODES) += anon_inodes.o