commit 8ec2ef2b66ea2fd00acc28aca8edaad441dbb424
author Stephen Rothwell <sfr@canb.auug.org.au> Mon Sep 19 15:50:16 2016 +1000
committer Jens Axboe <axboe@fb.com> Mon Sep 19 08:21:51 2016 -0600
tree 5f46c82958d879c841ae666c7fbeb1a520eb08db
parent 9151bcb4fb38aab04cdc67cc3b3e11396db1b8b4

blk_mq: linux/blk-mq.h does not include all the headers it depends on

and building block/blk-mq-pci.o should depend on CONFIG_BLOCK

Fixes: 973c4e372c8f ("blk-mq: provide a default queue mapping for PCI device")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

block/Makefile

diff --git a/block/Makefile b/block/Makefile
index 2447a0b..37a0d93 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -22,4 +22,4 @@
 obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
 obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
 obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
-obj-$(CONFIG_PCI)		+= blk-mq-pci.o
+obj-$(CONFIG_BLK_MQ_PCI)	+= blk-mq-pci.o