diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /fs/jfs | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'fs/jfs')
| -rw-r--r-- | fs/jfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 3630718be395..0dae345e481b 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c | |||
| @@ -199,7 +199,7 @@ enum { | |||
| 199 | Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask | 199 | Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask |
| 200 | }; | 200 | }; |
| 201 | 201 | ||
| 202 | static match_table_t tokens = { | 202 | static const match_table_t tokens = { |
| 203 | {Opt_integrity, "integrity"}, | 203 | {Opt_integrity, "integrity"}, |
| 204 | {Opt_nointegrity, "nointegrity"}, | 204 | {Opt_nointegrity, "nointegrity"}, |
| 205 | {Opt_iocharset, "iocharset=%s"}, | 205 | {Opt_iocharset, "iocharset=%s"}, |