Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block

[mv-sheeva.git] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index fefa9a4967083208ff880d5a6b31139042661827..9049d460fa890fd45e3e31c1aa8ca9ed080e9f81 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -5,7 +5,6 @@
 #include <linux/hdreg.h>
 #include <linux/backing-dev.h>
 #include <linux/buffer_head.h>
-#include <linux/smp_lock.h>
 #include <linux/blktrace_api.h>
 #include <asm/uaccess.h>