diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 16:34:43 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 16:34:43 +0100 |
commit | 8c54436ae9f59146b3d02820a3ebbf71e61f2aee (patch) | |
tree | 0ab1a3847809bd7d5f44fc52b1f16fabd953c4bb /fs/squashfs/squashfs.h | |
parent | 5ed0cec0ac5f1b3759bdbe4d9df32ee4ff8afb5a (diff) | |
parent | 7a203f3b089be4410fe065dd9927027eade94557 (diff) |
Merge branches 'sched/cleanups' and 'linus' into sched/core
Diffstat (limited to 'fs/squashfs/squashfs.h')
-rw-r--r-- | fs/squashfs/squashfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h index 6b2515d027d..0e9feb6adf7 100644 --- a/fs/squashfs/squashfs.h +++ b/fs/squashfs/squashfs.h @@ -34,7 +34,7 @@ static inline struct squashfs_inode_info *squashfs_i(struct inode *inode) /* block.c */ extern int squashfs_read_data(struct super_block *, void **, u64, int, u64 *, - int); + int, int); /* cache.c */ extern struct squashfs_cache *squashfs_cache_init(char *, int, int); |