[BLOCK] Only include the compat ioctl code if CONFIG_BLOCK is set

Add an extra CONFIG_BLOCK_COMPAT that we can use in the Makefile

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/block/Kconfig b/block/Kconfig
index 2484e0e9d89c9127c0678052b18bfa879b8a827d..e10895647f728bc2cca05c1f39a37a0f49659d5e 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -62,6 +62,10 @@ config BLK_DEV_BSG
        protocols (e.g. Task Management Functions and SMP in Serial
        Attached SCSI).
 
+config BLOCK_COMPAT
+       bool
+       default y
+
 endif # BLOCK
 
 source block/Kconfig.iosched

diff --git a/block/Makefile b/block/Makefile
index 3cfe7cebaa6ad3222eb3161367101b755dccd79d..826108190f00d3ed9afc1cba7869424584cd6dd4 100644 (file)
--- a/block/Makefile
+++ b/block/Makefile
@@ -11,4 +11,4 @@ obj-$(CONFIG_IOSCHED_DEADLINE)        += deadline-iosched.o
 obj-$(CONFIG_IOSCHED_CFQ)      += cfq-iosched.o
 
 obj-$(CONFIG_BLK_DEV_IO_TRACE) += blktrace.o
-obj-$(CONFIG_COMPAT)           += compat_ioctl.o
+obj-$(CONFIG_BLOCK_COMPAT)     += compat_ioctl.o