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/udf/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/udf/super.c')
| -rw-r--r-- | fs/udf/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 5698bbf83bbf..e25e7010627b 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
| @@ -369,7 +369,7 @@ enum { | |||
| 369 | Opt_err, Opt_uforget, Opt_uignore, Opt_gforget, Opt_gignore | 369 | Opt_err, Opt_uforget, Opt_uignore, Opt_gforget, Opt_gignore |
| 370 | }; | 370 | }; |
| 371 | 371 | ||
| 372 | static match_table_t tokens = { | 372 | static const match_table_t tokens = { |
| 373 | {Opt_novrs, "novrs"}, | 373 | {Opt_novrs, "novrs"}, |
| 374 | {Opt_nostrict, "nostrict"}, | 374 | {Opt_nostrict, "nostrict"}, |
| 375 | {Opt_bs, "bs=%u"}, | 375 | {Opt_bs, "bs=%u"}, |