summaryrefslogtreecommitdiffstats
path: root/drivers/misc/ibmasm/ibmasmfs.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-09-29 23:47:33 +0200
committerJames Morris <jmorris@namei.org>2009-09-29 23:47:33 +0200
commit1669b049db50fc7f1d4e694fb115a0f408c63fce (patch)
tree9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /drivers/misc/ibmasm/ibmasmfs.c
parentTPM: increase default TPM buffer (diff)
parentLinux 2.6.32-rc1 (diff)
downloadlinux-1669b049db50fc7f1d4e694fb115a0f408c63fce.tar.xz
linux-1669b049db50fc7f1d4e694fb115a0f408c63fce.zip
Merge branch 'master' into next
Diffstat (limited to 'drivers/misc/ibmasm/ibmasmfs.c')
-rw-r--r--drivers/misc/ibmasm/ibmasmfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index de966a6fb7e6..aecf40ecb3a4 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -97,7 +97,7 @@ static int ibmasmfs_get_super(struct file_system_type *fst,
return get_sb_single(fst, flags, data, ibmasmfs_fill_super, mnt);
}
-static struct super_operations ibmasmfs_s_ops = {
+static const struct super_operations ibmasmfs_s_ops = {
.statfs = simple_statfs,
.drop_inode = generic_delete_inode,
};