diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /fs/hppfs/hppfs_kern.c | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/hppfs/hppfs_kern.c')
| -rw-r--r-- | fs/hppfs/hppfs_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c index dcb6d2e988b8..642675fc394a 100644 --- a/fs/hppfs/hppfs_kern.c +++ b/fs/hppfs/hppfs_kern.c | |||
| @@ -572,7 +572,7 @@ struct hppfs_dirent { | |||
| 572 | }; | 572 | }; |
| 573 | 573 | ||
| 574 | static int hppfs_filldir(void *d, const char *name, int size, | 574 | static int hppfs_filldir(void *d, const char *name, int size, |
| 575 | loff_t offset, ino_t inode, unsigned int type) | 575 | loff_t offset, u64 inode, unsigned int type) |
| 576 | { | 576 | { |
| 577 | struct hppfs_dirent *dirent = d; | 577 | struct hppfs_dirent *dirent = d; |
| 578 | 578 | ||