projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
[platform/kernel/kernel-mfld-blackbay.git]
/
block
/
ioctl.c
diff --git
a/block/ioctl.c
b/block/ioctl.c
index
fefa9a4
..
9049d46
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>