From 3797ba0b62debb71af4606910acacc9896a9ae3b Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 25 Jun 2000 01:20:01 +0000
Subject: Merge with Linux 2.4.0-test2.

---
 fs/filesystems.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'fs/filesystems.c')

diff --git a/fs/filesystems.c b/fs/filesystems.c
index 22f6aa6db..ce64f4c8e 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -52,7 +52,7 @@ void __init filesystem_setup(void)
 #ifdef CONFIG_NFSD_MODULE
 int (*do_nfsservctl)(int, void *, void *);
 #endif
-int
+long
 asmlinkage sys_nfsservctl(int cmd, void *argp, void *resp)
 {
 #ifndef CONFIG_NFSD_MODULE
-- 
cgit v1.2.3