summaryrefslogtreecommitdiffstats
path: root/fs/efs/file.c
diff options
context:
space:
mode:
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-02-26 14:26:14 +1100
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-02-26 14:26:14 +1100
commit91e229bbad6524aabaac8717b2f559283670c37a (patch)
tree84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /fs/efs/file.c
parent6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff)
parentbfa274e2436fc7ef72ef51c878083647f1cfd429 (diff)
downloadop-kernel-dev-91e229bbad6524aabaac8717b2f559283670c37a.zip
op-kernel-dev-91e229bbad6524aabaac8717b2f559283670c37a.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/efs/file.c b/fs/efs/file.c
index 5db2012..1ccb364 100644
--- a/fs/efs/file.c
+++ b/fs/efs/file.c
@@ -7,7 +7,7 @@
*/
#include <linux/buffer_head.h>
-#include <linux/efs_fs.h>
+#include "efs.h"
int efs_get_block(struct inode *inode, sector_t iblock,
struct buffer_head *bh_result, int create)
OpenPOWER on IntegriCloud