mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 12:10:52 -04:00
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
This commit is contained in:
commit
18a043f941
2 changed files with 16 additions and 14 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue