diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-01 19:28:15 +0200 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-01 19:28:15 +0200 |
commit | cc85906110e26fe8537c3bdbc08a74ae8110030b (patch) | |
tree | 891813098ede3dba4d5ff3b83b1f7b491367ad2f /fs/nfs/callback.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
parent | SUNRPC: Ensure IPV6_V6ONLY is set on the socket before binding to a port (diff) | |
download | linux-cc85906110e26fe8537c3bdbc08a74ae8110030b.tar.xz linux-cc85906110e26fe8537c3bdbc08a74ae8110030b.zip |
Merge branch 'devel' into for-linus
Diffstat (limited to 'fs/nfs/callback.h')
-rw-r--r-- | fs/nfs/callback.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h index bb25d2135ff1..e110e286a262 100644 --- a/fs/nfs/callback.h +++ b/fs/nfs/callback.h @@ -72,5 +72,6 @@ extern void nfs_callback_down(void); extern unsigned int nfs_callback_set_tcpport; extern unsigned short nfs_callback_tcpport; +extern unsigned short nfs_callback_tcpport6; #endif /* __LINUX_FS_NFS_CALLBACK_H */ |