Merge branch 'upstream-fixes' into upstream

[linux-2.6] / fs / affs / dir.c

diff --git a/fs/affs/dir.c b/fs/affs/dir.c
index 548efd0ee98cd9e8e5449abde56d0c2821afaed4..5d9649fa1814c1ab8d2d4f91f4dd24aa6a81ce55 100644 (file)
--- a/fs/affs/dir.c
+++ b/fs/affs/dir.c
@@ -17,7 +17,7 @@
 
 static int affs_readdir(struct file *, void *, filldir_t);
 
-struct file_operations affs_dir_operations = {
+const struct file_operations affs_dir_operations = {
        .read           = generic_read_dir,
        .readdir        = affs_readdir,
        .fsync          = file_fsync,