diff --git a/[refs] b/[refs] index f2b68b10514a..ac26ea23ad27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b2ca38ad6c44ed0442092a829e6e954bf3580af +refs/heads/master: 1e5140279f31e47d58ed6036ee61ba7a65710e63 diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c index 5ab80edc795b..baac89d917ca 100644 --- a/trunk/fs/nfsd/nfsctl.c +++ b/trunk/fs/nfsd/nfsctl.c @@ -35,7 +35,6 @@ #include #include #include -#include #include diff --git a/trunk/include/linux/nfsd/interface.h b/trunk/include/linux/nfsd/interface.h deleted file mode 100644 index af0979704afb..000000000000 --- a/trunk/include/linux/nfsd/interface.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * include/linux/nfsd/interface.h - * - * defines interface between nfsd and other bits of - * the kernel. Particularly filesystems (eventually). - * - * Copyright (C) 2000 Neil Brown - */ - -#ifndef LINUX_NFSD_INTERFACE_H -#define LINUX_NFSD_INTERFACE_H - -#endif /* LINUX_NFSD_INTERFACE_H */ diff --git a/trunk/include/linux/nfsd/nfsd.h b/trunk/include/linux/nfsd/nfsd.h index 72feac581aa3..0d8420497765 100644 --- a/trunk/include/linux/nfsd/nfsd.h +++ b/trunk/include/linux/nfsd/nfsd.h @@ -22,7 +22,6 @@ #include #include #include -#include /* * nfsd version */