diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-25 01:55:49 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 02:32:41 +0200 |
commit | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (patch) | |
tree | b22ee51689090eea8485570a7f06aca7429eb0fa | |
parent | x86/oprofile/nmi_int: add Nehalem to list of ppro cores (diff) | |
download | linux-fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43.tar.xz linux-fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43.zip |
fix fs/nfs/nfsroot.c compilation
This fixes the following compile error caused by commit
f9247273cb69ba101877e946d2d83044409cc8c5 ("UFS: add const to parser
token table"):
CC fs/nfs/nfsroot.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/nfs/nfsroot.c:130: error: tokens causes a section type conflict
make[3]: *** [fs/nfs/nfsroot.o] Error 1
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 46763d1cd397..8478fc25daee 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c @@ -127,7 +127,7 @@ enum { Opt_err }; -static match_table_t __initdata tokens = { +static match_table_t __initconst tokens = { {Opt_port, "port=%u"}, {Opt_rsize, "rsize=%u"}, {Opt_wsize, "wsize=%u"}, |