diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 19:08:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 19:08:13 -0700 |
| commit | 4b8447184ae85de4ce710e5f561fbaada21b8394 (patch) | |
| tree | 71aed2c654a6d8d83beff480bc84d9e63b366858 /arch/parisc/hpux/fs.c | |
| parent | a43cdf08a1b1ab3c013059b5fa4c1b7561e53cb7 (diff) | |
| parent | 1604f31895dcdb42edf6511ce7ef0546ff92c8e5 (diff) | |
| download | op-kernel-dev-4b8447184ae85de4ce710e5f561fbaada21b8394.zip op-kernel-dev-4b8447184ae85de4ce710e5f561fbaada21b8394.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6:
[PA-RISC] Fix time.c for new do_timer() calling convention
[PA-RISC] Fix must_check warnings in drivers.c
[PA-RISC] Fix parisc_newuname()
[PA-RISC] Remove warning from pci.c
[PA-RISC] Fix filldir warnings
[PA-RISC] Fix sys32_sysctl
[PA-RISC] Fix sba_iommu compilation
Diffstat (limited to 'arch/parisc/hpux/fs.c')
| -rw-r--r-- | arch/parisc/hpux/fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c index 2d58b92..4204cd1 100644 --- a/arch/parisc/hpux/fs.c +++ b/arch/parisc/hpux/fs.c @@ -73,7 +73,7 @@ struct getdents_callback { #define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1)) static int filldir(void * __buf, const char * name, int namlen, loff_t offset, - ino_t ino, unsigned d_type) + u64 ino, unsigned d_type) { struct hpux_dirent * dirent; struct getdents_callback * buf = (struct getdents_callback *) __buf; |
