Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

[linux-2.6.git] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index d386912..6715972 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -47,7 +47,6 @@
 #include <linux/syscalls.h>
 #include <linux/rmap.h>
 #include <linux/ckrm.h>
-#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>