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/file.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/file.c')
| -rw-r--r-- | fs/efs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/efs/file.c b/fs/efs/file.c index 5db20129681e..1ccb364ffa63 100644 --- a/fs/efs/file.c +++ b/fs/efs/file.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/buffer_head.h> | 9 | #include <linux/buffer_head.h> |
| 10 | #include <linux/efs_fs.h> | 10 | #include "efs.h" |
| 11 | 11 | ||
| 12 | int efs_get_block(struct inode *inode, sector_t iblock, | 12 | int efs_get_block(struct inode *inode, sector_t iblock, |
| 13 | struct buffer_head *bh_result, int create) | 13 | struct buffer_head *bh_result, int create) |