diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 00:24:28 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 00:24:28 (GMT) |
commit | 18a043f9413277523cf5011e594caa1747db4948 (patch) | |
tree | f5d7e908bf62e67184f91ce83b6b7624755826ac /fs | |
parent | 31453a9764f7e2a72a6e2c502ace586e2663a68c (diff) | |
parent | eb1c86b8b501ad9a073d9d519105979d31fa0ef2 (diff) | |
download | linux-18a043f9413277523cf5011e594caa1747db4948.tar.xz |
Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: rename nfs.upcall -> nfs.idmap
NFS: Fix a compile issue in nfs_root
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/nfsroot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index 460df36..903908a 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c @@ -101,6 +101,7 @@ static char nfs_export_path[NFS_MAXPATHLEN + 1] __initdata = ""; /* server:export path string passed to super.c */ static char nfs_root_device[NFS_MAXPATHLEN + 1] __initdata = ""; +#ifdef RPC_DEBUG /* * When the "nfsrootdebug" kernel command line option is specified, * enable debugging messages for NFSROOT. @@ -112,6 +113,7 @@ static int __init nfs_root_debug(char *__unused) } __setup("nfsrootdebug", nfs_root_debug); +#endif /* * Parse NFS server and directory information passed on the kernel |