summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-07-25 02:55:49 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 17:32:41 -0700
commitfb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (patch)
treeb22ee51689090eea8485570a7f06aca7429eb0fa
parent4b9f12a3779c548b68bc9af7d94030868ad3aa1b (diff)
downloadlinux-stable-fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43.tar.gz
linux-stable-fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43.tar.bz2
linux-stable-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.c2
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"},