From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 5 May 2007 21:05:11 +0000 (+0100)
Subject: Fix nfsroot build
X-Git-Tag: v2.6.22-rc1~1013
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=989485c190cc6a64e5a21d98ef2d752df1db8c27;p=linux-2.6-omap-h63xx.git

Fix nfsroot build

  CC      fs/nfs/nfsroot.o
fs/nfs/nfsroot.c:131: error: tokens causes a section type conflict
make[2]: *** [fs/nfs/nfsroot.o] Error 1

This is due to mixing const and non-const content in the same section
which halfway recent gccs absolutely hate.  Fixed by dropping the const.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/parser.h b/include/linux/parser.h
index 86676f60099..26b2bdfcaf0 100644
--- a/include/linux/parser.h
+++ b/include/linux/parser.h
@@ -14,7 +14,7 @@ struct match_token {
 	const char *pattern;
 };
 
-typedef const struct match_token match_table_t[];
+typedef struct match_token match_table_t[];
 
 /* Maximum number of arguments that match_token will find in a pattern */
 enum {MAX_OPT_ARGS = 3};