diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:26:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:26:53 -0400 |
| commit | f81b691a3df09806385ea413c3a2ee094c705ca3 (patch) | |
| tree | 01c0d6d319fcbddc98171d06cfe8e742cd270455 /fs/jffs2/jffs2_fs_i.h | |
| parent | 110e0358e7dfd9cc56d47077068f3680dae10b56 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/pat
Diffstat (limited to 'fs/jffs2/jffs2_fs_i.h')
| -rw-r--r-- | fs/jffs2/jffs2_fs_i.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jffs2/jffs2_fs_i.h b/fs/jffs2/jffs2_fs_i.h index 31559f45fdde..4c41db91eaa4 100644 --- a/fs/jffs2/jffs2_fs_i.h +++ b/fs/jffs2/jffs2_fs_i.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _JFFS2_FS_I | 12 | #ifndef _JFFS2_FS_I |
| 13 | #define _JFFS2_FS_I | 13 | #define _JFFS2_FS_I |
| 14 | 14 | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/rbtree.h> | 15 | #include <linux/rbtree.h> |
| 17 | #include <linux/posix_acl.h> | 16 | #include <linux/posix_acl.h> |
| 18 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |