aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Le Goater <clg@fr.ibm.com>2006-10-04 05:16:21 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:24 -0400
commitf7aa2638f288f4c67acdb55947472740bd27d27a (patch)
tree3710565111a49ac65a190268dd7c0eaab301b478
parent42ca09938157105c1f573c831a35e9c3e02eb354 (diff)
[PATCH] Fix linux/nfsd/const.h for make headers_check
make headers_check fails on linux/nfsd/const.h. Since linux/sunrpc/msg_prot.h does not seem to export anything interesting for userspace, this patch moves it in the __KERNEL__ protected section. Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/nfsd/const.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/nfsd/const.h b/include/linux/nfsd/const.h
index f478066f9cd5..f0cc77790527 100644
--- a/include/linux/nfsd/const.h
+++ b/include/linux/nfsd/const.h
@@ -13,7 +13,6 @@
13#include <linux/nfs2.h> 13#include <linux/nfs2.h>
14#include <linux/nfs3.h> 14#include <linux/nfs3.h>
15#include <linux/nfs4.h> 15#include <linux/nfs4.h>
16#include <linux/sunrpc/msg_prot.h>
17 16
18/* 17/*
19 * Maximum protocol version supported by knfsd 18 * Maximum protocol version supported by knfsd
@@ -29,6 +28,8 @@
29 28
30#ifdef __KERNEL__ 29#ifdef __KERNEL__
31 30
31#include <linux/sunrpc/msg_prot.h>
32
32#ifndef NFS_SUPER_MAGIC 33#ifndef NFS_SUPER_MAGIC
33# define NFS_SUPER_MAGIC 0x6969 34# define NFS_SUPER_MAGIC 0x6969
34#endif 35#endif