diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 03:04:25 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 03:04:25 -0500 |
| commit | fe040be2fdc49a4132c5f64359c629aeeb8e4947 (patch) | |
| tree | 40323a8f05d3754372f561bb8f4698ef1a4e9c8f /fs/block_dev.c | |
| parent | 2006920a18cc9f499e5cccf9e6f1aa9f6120705e (diff) | |
| parent | 6722a4016d7f5f107a82ad71a3ee1ccec105532f (diff) | |
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 06e8ff12b97c..4230252fd689 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
| 12 | #include <linux/kmod.h> | 12 | #include <linux/kmod.h> |
| 13 | #include <linux/major.h> | 13 | #include <linux/major.h> |
| 14 | #include <linux/smp_lock.h> | ||
| 15 | #include <linux/device_cgroup.h> | 14 | #include <linux/device_cgroup.h> |
| 16 | #include <linux/highmem.h> | 15 | #include <linux/highmem.h> |
| 17 | #include <linux/blkdev.h> | 16 | #include <linux/blkdev.h> |