summaryrefslogtreecommitdiff
path: root/fs/block_dev.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-12-23 08:48:41 (GMT)
committerIngo Molnar <mingo@elte.hu>2010-12-23 08:48:41 (GMT)
commit26e20a108caca6231c6a5ec659f815a866904751 (patch)
tree36932c208a9e8994bfd7ed4eaf48b9c33f71fbe3 /fs/block_dev.c
parent691513f70d3957939a318da970987b876c720861 (diff)
parent90a8a73c06cc32b609a880d48449d7083327e11a (diff)
downloadlinux-fsl-qoriq-26e20a108caca6231c6a5ec659f815a866904751.tar.xz
Merge commit 'v2.6.37-rc7' into x86/security
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r--fs/block_dev.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 06e8ff1..4230252 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -11,7 +11,6 @@
#include <linux/slab.h>
#include <linux/kmod.h>
#include <linux/major.h>
-#include <linux/smp_lock.h>
#include <linux/device_cgroup.h>
#include <linux/highmem.h>
#include <linux/blkdev.h>