diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-10 06:29:47 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-10 06:29:47 +0200 |
commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /fs/nfs/getroot.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
parent | Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 (diff) | |
download | linux-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.tar.xz linux-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'fs/nfs/getroot.c')
-rw-r--r-- | fs/nfs/getroot.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c index 46177cb87064..b35d2a616066 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c @@ -30,7 +30,6 @@ #include <linux/nfs_idmap.h> #include <linux/vfs.h> #include <linux/namei.h> -#include <linux/mnt_namespace.h> #include <linux/security.h> #include <asm/system.h> |