diff options
author | Len Brown <len.brown@intel.com> | 2006-06-30 01:57:46 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-30 01:57:46 +0200 |
commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/ramfs/file-nommu.c | |
parent | Pull acpica into release branch (diff) | |
parent | [PATCH] usb gadget: fixup pxa2xx_udc to include asm/arch/udc.h again (diff) | |
download | linux-d120cfb544ed6161b9d32fb6c4648c471807ee6b.tar.xz linux-d120cfb544ed6161b9d32fb6c4648c471807ee6b.zip |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/ramfs/file-nommu.c')
-rw-r--r-- | fs/ramfs/file-nommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c index f443a84b98a5..99fffc9e1bfd 100644 --- a/fs/ramfs/file-nommu.c +++ b/fs/ramfs/file-nommu.c @@ -27,7 +27,7 @@ static int ramfs_nommu_setattr(struct dentry *, struct iattr *); -struct address_space_operations ramfs_aops = { +const struct address_space_operations ramfs_aops = { .readpage = simple_readpage, .prepare_write = simple_prepare_write, .commit_write = simple_commit_write |