summaryrefslogtreecommitdiffstats
path: root/fs/omfs/inode.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-17 12:25:43 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-17 12:25:43 +0200
commit0f1f6dec9593c8319714c927dafb443548a1452a (patch)
tree74f887dc86747523e82f08900501073f451996cc /fs/omfs/inode.c
parent8cd162ce230b154e564a1285bb5f89fcf73f0dce (diff)
parent2e532d68a2b3e2aa6b19731501222069735c741c (diff)
downloadkernel-crypto-0f1f6dec9593c8319714c927dafb443548a1452a.tar.gz
kernel-crypto-0f1f6dec9593c8319714c927dafb443548a1452a.tar.xz
kernel-crypto-0f1f6dec9593c8319714c927dafb443548a1452a.zip
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'fs/omfs/inode.c')
-rw-r--r--fs/omfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index d29047b1b9b..cbf047a847c 100644
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -346,7 +346,7 @@ enum {
Opt_uid, Opt_gid, Opt_umask, Opt_dmask, Opt_fmask
};
-static match_table_t tokens = {
+static const match_table_t tokens = {
{Opt_uid, "uid=%u"},
{Opt_gid, "gid=%u"},
{Opt_umask, "umask=%o"},