diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/ncpfs | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/ncpfs')
| -rw-r--r-- | fs/ncpfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/ncpfs/symlink.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 90d2ea28f333..6c51c1198464 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
| @@ -105,7 +105,7 @@ static struct super_operations ncp_sops = | |||
| 105 | 105 | ||
| 106 | extern struct dentry_operations ncp_root_dentry_operations; | 106 | extern struct dentry_operations ncp_root_dentry_operations; |
| 107 | #if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS) | 107 | #if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS) |
| 108 | extern struct address_space_operations ncp_symlink_aops; | 108 | extern const struct address_space_operations ncp_symlink_aops; |
| 109 | extern int ncp_symlink(struct inode*, struct dentry*, const char*); | 109 | extern int ncp_symlink(struct inode*, struct dentry*, const char*); |
| 110 | #endif | 110 | #endif |
| 111 | 111 | ||
diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c index e935f1b34bc2..f76b1392a012 100644 --- a/fs/ncpfs/symlink.c +++ b/fs/ncpfs/symlink.c | |||
| @@ -99,7 +99,7 @@ fail: | |||
| 99 | /* | 99 | /* |
| 100 | * symlinks can't do much... | 100 | * symlinks can't do much... |
| 101 | */ | 101 | */ |
| 102 | struct address_space_operations ncp_symlink_aops = { | 102 | const struct address_space_operations ncp_symlink_aops = { |
| 103 | .readpage = ncp_symlink_readpage, | 103 | .readpage = ncp_symlink_readpage, |
| 104 | }; | 104 | }; |
| 105 | 105 | ||