diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /fs/bfs/bfs.h | |
| parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
| parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'fs/bfs/bfs.h')
| -rw-r--r-- | fs/bfs/bfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bfs/bfs.h b/fs/bfs/bfs.h index 9d791004b21c..31973bbbf057 100644 --- a/fs/bfs/bfs.h +++ b/fs/bfs/bfs.h | |||
| @@ -50,7 +50,7 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode) | |||
| 50 | /* file.c */ | 50 | /* file.c */ |
| 51 | extern struct inode_operations bfs_file_inops; | 51 | extern struct inode_operations bfs_file_inops; |
| 52 | extern const struct file_operations bfs_file_operations; | 52 | extern const struct file_operations bfs_file_operations; |
| 53 | extern struct address_space_operations bfs_aops; | 53 | extern const struct address_space_operations bfs_aops; |
| 54 | 54 | ||
| 55 | /* dir.c */ | 55 | /* dir.c */ |
| 56 | extern struct inode_operations bfs_dir_inops; | 56 | extern struct inode_operations bfs_dir_inops; |