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/ext2/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/ext2/super.c')
| -rw-r--r-- | fs/ext2/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index fd88c7b43e66..647cd888ac87 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
| @@ -393,7 +393,7 @@ enum { | |||
| 393 | Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation | 393 | Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation |
| 394 | }; | 394 | }; |
| 395 | 395 | ||
| 396 | static match_table_t tokens = { | 396 | static const match_table_t tokens = { |
| 397 | {Opt_bsd_df, "bsddf"}, | 397 | {Opt_bsd_df, "bsddf"}, |
| 398 | {Opt_minix_df, "minixdf"}, | 398 | {Opt_minix_df, "minixdf"}, |
| 399 | {Opt_grpid, "grpid"}, | 399 | {Opt_grpid, "grpid"}, |