diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-19 19:04:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-19 19:04:47 +0200 |
| commit | 3e10e879a8c334a5927d800a3663a24d562cfa31 (patch) | |
| tree | 5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 /fs/affs | |
| parent | 98d9c66ab07471006fd7910cb16453581c41a3e7 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
| download | kernel_samsung_aries-3e10e879a8c334a5927d800a3663a24d562cfa31.zip kernel_samsung_aries-3e10e879a8c334a5927d800a3663a24d562cfa31.tar.gz kernel_samsung_aries-3e10e879a8c334a5927d800a3663a24d562cfa31.tar.bz2 | |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/affs/super.c b/fs/affs/super.c index 3a89094..8989c93 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -135,7 +135,7 @@ enum { Opt_verbose, Opt_volume, Opt_ignore, Opt_err, }; -static match_table_t tokens = { +static const match_table_t tokens = { {Opt_bs, "bs=%u"}, {Opt_mode, "mode=%o"}, {Opt_mufs, "mufs"}, |