Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[mirror_ubuntu-zesty-kernel.git] / block / Makefile

diff --git a/block/Makefile b/block/Makefile
index 959feeb253be99a8cceb92220f0a9f0253bcf7ca..826108190f00d3ed9afc1cba7869424584cd6dd4 100644 (file)
--- a/block/Makefile
+++ b/block/Makefile
@@ -11,3 +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_BLOCK_COMPAT)     += compat_ioctl.o