aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe2007-10-12 05:50:41 -0500
committerJens Axboe2007-10-12 05:50:41 -0500
commit99874d50481c093adfe74e796436024d88b6a48c (patch)
tree84f0b0705b9d61cb7ed59d5d28a947880d2968d4 /block
parent43d28d98bed372649060ef783719b426a91972ed (diff)
downloadkernel-common-99874d50481c093adfe74e796436024d88b6a48c.tar.gz
kernel-common-99874d50481c093adfe74e796436024d88b6a48c.tar.xz
kernel-common-99874d50481c093adfe74e796436024d88b6a48c.zip
[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>
Diffstat (limited to 'block')
-rw-r--r--block/Kconfig4
-rw-r--r--block/Makefile2
2 files changed, 5 insertions, 1 deletions
diff --git a/block/Kconfig b/block/Kconfig
index 2484e0e9d89..e10895647f7 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -62,6 +62,10 @@ config BLK_DEV_BSG
62 protocols (e.g. Task Management Functions and SMP in Serial 62 protocols (e.g. Task Management Functions and SMP in Serial
63 Attached SCSI). 63 Attached SCSI).
64 64
65config BLOCK_COMPAT
66 bool
67 default y
68
65endif # BLOCK 69endif # BLOCK
66 70
67source block/Kconfig.iosched 71source block/Kconfig.iosched
diff --git a/block/Makefile b/block/Makefile
index 3cfe7cebaa6..826108190f0 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -11,4 +11,4 @@ obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
11obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o 11obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
12 12
13obj-$(CONFIG_BLK_DEV_IO_TRACE) += blktrace.o 13obj-$(CONFIG_BLK_DEV_IO_TRACE) += blktrace.o
14obj-$(CONFIG_COMPAT) += compat_ioctl.o 14obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o