From 1c3cefa582a6b598d204bad02676df300e457efa Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 4 Feb 2002 20:13:37 -0800 Subject: v2.4.9.4 -> v2.4.9.5 - Merge with Alan - Trond Myklebust: NFS fixes - kmap and root inode special case - Al Viro: more superblock cleanups, inode leak in rd.c, minix directories in page cache - Paul Mackerras: clean up rubbish from sl82c105.c - Neil Brown: md/raid cleanups, NFS filehandles - Johannes Erdfelt: USB update (usb-2.0 support, visor fix, Clie fix, pl2303 driver update) - David Miller: sparc and net update - Eric Biederman: simplify and correct bootdata allocation - don't overwrite ramdisks - Tim Waugh: support multiple SuperIO devices, parport doc updates --- include/linux/lockd/xdr.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/linux/lockd') diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h index 72752441ef8c..9354683a720f 100644 --- a/include/linux/lockd/xdr.h +++ b/include/linux/lockd/xdr.h @@ -82,7 +82,6 @@ struct nlm_reboot { */ #define NLMSVC_XDRSIZE sizeof(struct nlm_args) -void nlmxdr_init(void); int nlmsvc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *); int nlmsvc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *); int nlmsvc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *); -- cgit v1.2.3