diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /fs/ntfs/ntfs.h | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'fs/ntfs/ntfs.h')
| -rw-r--r-- | fs/ntfs/ntfs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h index bf7b3d7c0930..ddd3d503097c 100644 --- a/fs/ntfs/ntfs.h +++ b/fs/ntfs/ntfs.h | |||
| @@ -57,8 +57,8 @@ extern struct kmem_cache *ntfs_attr_ctx_cache; | |||
| 57 | extern struct kmem_cache *ntfs_index_ctx_cache; | 57 | extern struct kmem_cache *ntfs_index_ctx_cache; |
| 58 | 58 | ||
| 59 | /* The various operations structs defined throughout the driver files. */ | 59 | /* The various operations structs defined throughout the driver files. */ |
| 60 | extern struct address_space_operations ntfs_aops; | 60 | extern const struct address_space_operations ntfs_aops; |
| 61 | extern struct address_space_operations ntfs_mst_aops; | 61 | extern const struct address_space_operations ntfs_mst_aops; |
| 62 | 62 | ||
| 63 | extern const struct file_operations ntfs_file_ops; | 63 | extern const struct file_operations ntfs_file_ops; |
| 64 | extern struct inode_operations ntfs_file_inode_ops; | 64 | extern struct inode_operations ntfs_file_inode_ops; |