From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 23:13:19 +0000 (+0000)
Subject: - sync vserver branch
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~112
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6d1f583df81cd36e2a0bd25025f5082de5802b67;p=linux-2.6.git

- sync vserver branch
---

diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index ec98d2ae3..9f72dc58d 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -38,8 +38,6 @@
 #include <linux/pagemap.h>
 #include <linux/mount.h>
 #include <linux/version.h>
-#include <linux/vs_memory.h>
-#include <linux/vs_cvirt.h>
 #include <linux/bitops.h>
 #include <linux/vs_memory.h>
 #include <linux/vs_cvirt.h>