diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-24 11:26:50 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 11:26:50 -0400 |
| commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
| tree | 962e068491b752a944f61c454fad3f8619a1ea3f /fs/jffs2 | |
| parent | 076d8423a98659a92837b07aa494cb74bfefe77c (diff) | |
| parent | 3dc5063786b273f1aee545844f6bd4e9651ebffe (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/jffs2_fs_i.h | 2 | ||||
| -rw-r--r-- | fs/jffs2/jffs2_fs_sb.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/jffs2_fs_i.h b/fs/jffs2/jffs2_fs_i.h index 0b78fdc9773b..a841f4973a74 100644 --- a/fs/jffs2/jffs2_fs_i.h +++ b/fs/jffs2/jffs2_fs_i.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/version.h> | 15 | #include <linux/version.h> |
| 16 | #include <linux/rbtree.h> | 16 | #include <linux/rbtree.h> |
| 17 | #include <linux/posix_acl.h> | 17 | #include <linux/posix_acl.h> |
| 18 | #include <asm/semaphore.h> | 18 | #include <linux/semaphore.h> |
| 19 | 19 | ||
| 20 | struct jffs2_inode_info { | 20 | struct jffs2_inode_info { |
| 21 | /* We need an internal mutex similar to inode->i_mutex. | 21 | /* We need an internal mutex similar to inode->i_mutex. |
diff --git a/fs/jffs2/jffs2_fs_sb.h b/fs/jffs2/jffs2_fs_sb.h index 3a2197f3c812..18fca2b9e531 100644 --- a/fs/jffs2/jffs2_fs_sb.h +++ b/fs/jffs2/jffs2_fs_sb.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
| 17 | #include <linux/workqueue.h> | 17 | #include <linux/workqueue.h> |
| 18 | #include <linux/completion.h> | 18 | #include <linux/completion.h> |
| 19 | #include <asm/semaphore.h> | 19 | #include <linux/semaphore.h> |
| 20 | #include <linux/timer.h> | 20 | #include <linux/timer.h> |
| 21 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
| 22 | #include <linux/list.h> | 22 | #include <linux/list.h> |