diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-01 20:36:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-01 20:36:13 +0100 |
| commit | f6d2e6f57bba66272b28dd20c949b14ce39cb804 (patch) | |
| tree | 2bf153af4d5b4b33ad2c1e88347c7fd752fb6332 /fs/hostfs/hostfs.h | |
| parent | 8caac56305cef98f9357b060a77939d17699937d (diff) | |
| parent | 7b1dedca42ac0d0d0be01e39d8461bb53a2389b3 (diff) | |
| download | op-kernel-dev-f6d2e6f57bba66272b28dd20c949b14ce39cb804.zip op-kernel-dev-f6d2e6f57bba66272b28dd20c949b14ce39cb804.tar.gz | |
Merge branch 'x86/urgent' into x86/iommu
Diffstat (limited to 'fs/hostfs/hostfs.h')
| -rw-r--r-- | fs/hostfs/hostfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h index 6ae9011..2f34f8f 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, |
