diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:14:25 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:14:25 (GMT) |
commit | 25d500067d5a666d1336598d1b324793554e5496 (patch) | |
tree | 3402308c4c69a66d02ce55f5c165e242fad2a8a9 /fs/squashfs/squashfs.h | |
parent | 0b13fda1e0936b3d64c4c407f183d33fa6bd2ad4 (diff) | |
parent | 9ead64974b05501bbac0d63a47c99fa786d064ba (diff) | |
download | linux-fsl-qoriq-25d500067d5a666d1336598d1b324793554e5496.tar.xz |
Merge branch 'linus' into core/ipi
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 6b2515d..0e9feb6 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); |