aboutsummaryrefslogtreecommitdiff
path: root/fs/hostfs/hostfs.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-08 15:07:49 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-08 15:07:49 +0100
commitaa9c9b8c584a42a094202b7e0f63497e888f86a7 (patch)
tree3cb3b022054a7c1722657288518f495e0c4d9983 /fs/hostfs/hostfs.h
parent87f7606591aea6a8a38ea4c8911b5eeeee2740b8 (diff)
parent218d11a8b071b23b76c484fd5f72a4fe3306801e (diff)
Merge branch 'linus' into x86/quirks
Diffstat (limited to 'fs/hostfs/hostfs.h')
-rw-r--r--fs/hostfs/hostfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h
index 6ae9011b95e..2f34f8f2134 100644
--- a/fs/hostfs/hostfs.h
+++ b/fs/hostfs/hostfs.h
@@ -81,7 +81,7 @@ extern int do_rmdir(const char *file);
extern int do_mknod(const char *file, int mode, unsigned int major,
unsigned int minor);
extern int link_file(const char *from, const char *to);
-extern int do_readlink(char *file, char *buf, int size);
+extern int hostfs_do_readlink(char *file, char *buf, int size);
extern int rename_file(char *from, char *to);
extern int do_statfs(char *root, long *bsize_out, long long *blocks_out,
long long *bfree_out, long long *bavail_out,