diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /fs/affs/affs.h | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'fs/affs/affs.h')
| -rw-r--r-- | fs/affs/affs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/affs/affs.h b/fs/affs/affs.h index 1dc8438ef389..7db2d287e9f3 100644 --- a/fs/affs/affs.h +++ b/fs/affs/affs.h | |||
| @@ -188,9 +188,9 @@ extern void affs_dir_truncate(struct inode *); | |||
| 188 | 188 | ||
| 189 | /* jump tables */ | 189 | /* jump tables */ |
| 190 | 190 | ||
| 191 | extern struct inode_operations affs_file_inode_operations; | 191 | extern const struct inode_operations affs_file_inode_operations; |
| 192 | extern struct inode_operations affs_dir_inode_operations; | 192 | extern const struct inode_operations affs_dir_inode_operations; |
| 193 | extern struct inode_operations affs_symlink_inode_operations; | 193 | extern const struct inode_operations affs_symlink_inode_operations; |
| 194 | extern const struct file_operations affs_file_operations; | 194 | extern const struct file_operations affs_file_operations; |
| 195 | extern const struct file_operations affs_file_operations_ofs; | 195 | extern const struct file_operations affs_file_operations_ofs; |
| 196 | extern const struct file_operations affs_dir_operations; | 196 | extern const struct file_operations affs_dir_operations; |