diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
| commit | cf9fe114e3b37e14fc8434d5abb192e35df551b1 (patch) | |
| tree | 0f82879295dc792f9df1a3ce79e143a3c073510f /fs/nfs/nfsroot.c | |
| parent | c1d0d32a603ed06377f404adf2c538de33bb3634 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/nfs/nfsroot.c')
| -rw-r--r-- | fs/nfs/nfsroot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index d9ef602fbc5a..e3ed5908820b 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c | |||
| @@ -129,7 +129,7 @@ enum { | |||
| 129 | Opt_err | 129 | Opt_err |
| 130 | }; | 130 | }; |
| 131 | 131 | ||
| 132 | static match_table_t __initconst tokens = { | 132 | static const match_table_t tokens __initconst = { |
| 133 | {Opt_port, "port=%u"}, | 133 | {Opt_port, "port=%u"}, |
| 134 | {Opt_rsize, "rsize=%u"}, | 134 | {Opt_rsize, "rsize=%u"}, |
| 135 | {Opt_wsize, "wsize=%u"}, | 135 | {Opt_wsize, "wsize=%u"}, |