From: Linus Torvalds Date: Sun, 25 Jun 2006 19:30:33 +0000 (-0700) Subject: Fix NFS2 compile error X-Git-Tag: v2.6.18-rc1~859 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f36f44de721db44b4c2944133c3c5c2e06f633f0;p=linux-2.6-omap-h63xx.git Fix NFS2 compile error Trond had apparently merged the same patch twice, causing a duplicate include of the "internal.h" file, with resulting obvious confusion. Tssk. I'm the only one allowed to send out trees that don't even compile! Who does this Trond guy think he is? Signed-off-by: Linus Torvalds --- diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c index 3b939e055a0..67391eef6b9 100644 --- a/fs/nfs/nfs2xdr.c +++ b/fs/nfs/nfs2xdr.c @@ -25,8 +25,6 @@ #include #include "internal.h" -#include "internal.h" - #define NFSDBG_FACILITY NFSDBG_XDR /* #define NFS_PARANOIA 1 */