diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-31 21:16:22 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-31 21:16:22 -0800 |
| commit | a1f3d4bba8ea395a39d34ade6017afee8be16031 (patch) | |
| tree | 874d843d35622f17aa6c3e048e42cf0d679bcb75 /include/linux/reiserfs_fs.h | |
| parent | 723d928417bffff6467da155d8ebbbe016464012 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into next
Diffstat (limited to 'include/linux/reiserfs_fs.h')
| -rw-r--r-- | include/linux/reiserfs_fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index 5ca47e59b727..c21072adbfad 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h @@ -22,7 +22,6 @@ #include <asm/unaligned.h> #include <linux/bitops.h> #include <linux/proc_fs.h> -#include <linux/smp_lock.h> #include <linux/buffer_head.h> #include <linux/reiserfs_fs_i.h> #include <linux/reiserfs_fs_sb.h> |