summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-07-25 02:55:49 +0300
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-10-07 17:59:49 -0400
commitbb8a3b53c20f2c07164a23ff6c320794fee8b95f (patch)
tree5bdea648d480ab297dd0967fcbbaf1c4e26f0b8d
parent691beb13cdc88358334ef0ba867c080a247a760f (diff)
downloadop-kernel-dev-bb8a3b53c20f2c07164a23ff6c320794fee8b95f.zip
op-kernel-dev-bb8a3b53c20f2c07164a23ff6c320794fee8b95f.tar.gz
fix fs/nfs/nfsroot.c compilation
This patch fixes the following compile error caused by commit f9247273cb69ba101877e946d2d83044409cc8c5 (UFS: add const to parser token tabl): <-- snip --> ... 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 <-- snip --> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-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 46763d1c..8478fc2 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"},
OpenPOWER on IntegriCloud