aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 15:30:33 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 15:30:33 -0400
commitf36f44de721db44b4c2944133c3c5c2e06f633f0 (patch)
tree47549ea4017b29532b633df4765da5b7c9feda6f /fs
parenta5d157e0675ac11188a8d429a062b1938bb2d353 (diff)
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 <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs2xdr.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index 3b939e055a08..67391eef6b93 100644
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -25,8 +25,6 @@
25#include <linux/nfs_fs.h> 25#include <linux/nfs_fs.h>
26#include "internal.h" 26#include "internal.h"
27 27
28#include "internal.h"
29
30#define NFSDBG_FACILITY NFSDBG_XDR 28#define NFSDBG_FACILITY NFSDBG_XDR
31/* #define NFS_PARANOIA 1 */ 29/* #define NFS_PARANOIA 1 */
32 30