summaryrefslogtreecommitdiff
path: root/fs/nfsctl.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
commit4b4f887fb2780e39383c1f202b72f5a2780b2d4c (patch)
treee790d89c2612d2464ac00063dac677653f4ac9cb /fs/nfsctl.c
parent6424db52e24e8cdf89917fa3c10395116440160e (diff)
parent76e7461a21dfe13565b2a323b53c8cc963541126 (diff)
downloadlwn-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.tar.gz
lwn-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.zip
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'fs/nfsctl.c')
-rw-r--r--fs/nfsctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsctl.c b/fs/nfsctl.c
index 8f9a20556f79..d3854d94b7cf 100644
--- a/fs/nfsctl.c
+++ b/fs/nfsctl.c
@@ -7,8 +7,6 @@
#include <linux/types.h>
#include <linux/file.h>
#include <linux/fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/syscall.h>
#include <linux/cred.h>
#include <linux/sched.h>