diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 23:57:46 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 23:57:46 (GMT) |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/romfs | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
| download | linux-fsl-qoriq-d120cfb544ed6161b9d32fb6c4648c471807ee6b.tar.xz | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/romfs')
| -rw-r--r-- | fs/romfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c index 283fbc6..22eed61 100644 --- a/fs/romfs/inode.c +++ b/fs/romfs/inode.c @@ -459,7 +459,7 @@ err_out: /* Mapping from our types to the kernel */ -static struct address_space_operations romfs_aops = { +static const struct address_space_operations romfs_aops = { .readpage = romfs_readpage }; |