summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:35:43 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:35:43 -0700
commit97c169a21bfb5bb2ab2bccd852da4f0d0e021c55 (patch)
tree8e1287cc995a9792e35b2687a7ef870ff15a483d /fs
parent9ab7486e446447c8e62f8f46ca85b809e6a9d491 (diff)
parent4cd426f24ff2d95dd9b3aa15fa5fca9736678ad5 (diff)
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git
Diffstat (limited to 'fs')
-rw-r--r--fs/adfs/adfs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index 63f5df9afb7..fd528433de4 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);
extern struct inode_operations adfs_file_inode_operations;
extern struct file_operations adfs_file_operations;
-extern inline __u32 signed_asl(__u32 val, signed int shift)
+static inline __u32 signed_asl(__u32 val, signed int shift)
{
if (shift >= 0)
val <<= shift;
@@ -112,7 +112,7 @@ extern inline __u32 signed_asl(__u32 val, signed int shift)
*
* The root directory ID should always be looked up in the map [3.4]
*/
-extern inline int
+static inline int
__adfs_block_map(struct super_block *sb, unsigned int object_id,
unsigned int block)
{