diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /fs/efs/inode.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/efs/inode.c')
| -rw-r--r-- | fs/efs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/efs/inode.c b/fs/efs/inode.c index 627c3026946d..79e19e5958e1 100644 --- a/fs/efs/inode.c +++ b/fs/efs/inode.c | |||
| @@ -7,11 +7,11 @@ | |||
| 7 | * and from work (c) 1998 Mike Shaver. | 7 | * and from work (c) 1998 Mike Shaver. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/efs_fs.h> | ||
| 11 | #include <linux/efs_fs_sb.h> | ||
| 12 | #include <linux/buffer_head.h> | 10 | #include <linux/buffer_head.h> |
| 13 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 14 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
| 13 | #include "efs.h" | ||
| 14 | #include <linux/efs_fs_sb.h> | ||
| 15 | 15 | ||
| 16 | static int efs_readpage(struct file *file, struct page *page) | 16 | static int efs_readpage(struct file *file, struct page *page) |
| 17 | { | 17 | { |