From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 18:37:34 +0000 (+0000)
Subject: - sync vserver branch:  will help future merges
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~152
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=031f845a99c9b3ea4576f5f98a6d98b5894f4bda;p=linux-2.6.git

- sync vserver branch:  will help future merges
---

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index dcac98d80..e4297b103 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -18,8 +18,6 @@
 #include <linux/init.h>
 #include <linux/idr.h>
 #include <linux/namei.h>
-#include <linux/vs_base.h>
-#include <linux/vserver/inode.h>
 #include <linux/bitops.h>
 #include <linux/vserver/inode.h>
 #include <asm/uaccess.h>
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 626457590..193df5410 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -45,8 +45,6 @@
 #include <linux/sysrq.h>
 #include <linux/vmalloc.h>
 #include <linux/crash_dump.h>
-#include <linux/vs_base.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>