diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:35:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:35:43 -0400 |
| commit | 97c169a21bfb5bb2ab2bccd852da4f0d0e021c55 (patch) | |
| tree | 8e1287cc995a9792e35b2687a7ef870ff15a483d /fs | |
| parent | 9ab7486e446447c8e62f8f46ca85b809e6a9d491 (diff) | |
| parent | 4cd426f24ff2d95dd9b3aa15fa5fca9736678ad5 (diff) | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/adfs/adfs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h index 63f5df9afb71..fd528433de43 100644 --- a/fs/adfs/adfs.h +++ b/fs/adfs/adfs.h | |||
| @@ -97,7 +97,7 @@ extern int adfs_dir_update(struct super_block *sb, struct object_info *obj); | |||
| 97 | extern struct inode_operations adfs_file_inode_operations; | 97 | extern struct inode_operations adfs_file_inode_operations; |
| 98 | extern struct file_operations adfs_file_operations; | 98 | extern struct file_operations adfs_file_operations; |
| 99 | 99 | ||
| 100 | extern inline __u32 signed_asl(__u32 val, signed int shift) | 100 | static inline __u32 signed_asl(__u32 val, signed int shift) |
| 101 | { | 101 | { |
| 102 | if (shift >= 0) | 102 | if (shift >= 0) |
| 103 | val <<= shift; | 103 | val <<= shift; |
| @@ -112,7 +112,7 @@ extern inline __u32 signed_asl(__u32 val, signed int shift) | |||
| 112 | * | 112 | * |
| 113 | * The root directory ID should always be looked up in the map [3.4] | 113 | * The root directory ID should always be looked up in the map [3.4] |
| 114 | */ | 114 | */ |
| 115 | extern inline int | 115 | static inline int |
| 116 | __adfs_block_map(struct super_block *sb, unsigned int object_id, | 116 | __adfs_block_map(struct super_block *sb, unsigned int object_id, |
| 117 | unsigned int block) | 117 | unsigned int block) |
| 118 | { | 118 | { |