diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /fs/adfs/super.c | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'fs/adfs/super.c')
| -rw-r--r-- | fs/adfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 26f3b43726bb..7f83a46f2b7e 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c | |||
| @@ -157,7 +157,7 @@ static int adfs_show_options(struct seq_file *seq, struct vfsmount *mnt) | |||
| 157 | 157 | ||
| 158 | enum {Opt_uid, Opt_gid, Opt_ownmask, Opt_othmask, Opt_err}; | 158 | enum {Opt_uid, Opt_gid, Opt_ownmask, Opt_othmask, Opt_err}; |
| 159 | 159 | ||
| 160 | static match_table_t tokens = { | 160 | static const match_table_t tokens = { |
| 161 | {Opt_uid, "uid=%u"}, | 161 | {Opt_uid, "uid=%u"}, |
| 162 | {Opt_gid, "gid=%u"}, | 162 | {Opt_gid, "gid=%u"}, |
| 163 | {Opt_ownmask, "ownmask=%o"}, | 163 | {Opt_ownmask, "ownmask=%o"}, |