Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

[~andy/linux] / fs / ubifs / ioctl.c

diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
index 6db7a6be6c9732a8a14cecc8ea60683522493442..8aacd64957a223c0a01e2d9c54dd73c9d7fbd409 100644 (file)
--- a/fs/ubifs/ioctl.c
+++ b/fs/ubifs/ioctl.c
@@ -25,7 +25,6 @@
 /* This file implements EXT2-compatible extended attribute ioctl() calls */
 
 #include <linux/compat.h>
-#include <linux/smp_lock.h>
 #include <linux/mount.h>
 #include "ubifs.h"