diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 12:34:25 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 12:34:25 +0100 |
| commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
| tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /fs/jffs2/jffs2_fs_i.h | |
| parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
| parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jffs2/jffs2_fs_i.h')
| -rw-r--r-- | fs/jffs2/jffs2_fs_i.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/jffs2_fs_i.h b/fs/jffs2/jffs2_fs_i.h index 0b78fdc9773..a841f4973a7 100644 --- a/fs/jffs2/jffs2_fs_i.h +++ b/fs/jffs2/jffs2_fs_i.h @@ -15,7 +15,7 @@ #include <linux/version.h> #include <linux/rbtree.h> #include <linux/posix_acl.h> -#include <asm/semaphore.h> +#include <linux/semaphore.h> struct jffs2_inode_info { /* We need an internal mutex similar to inode->i_mutex. |