From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 23:57:28 +0000 (+0000)
Subject: - remove redundant merge conflict
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~104
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6a59a6a7f1a3e5c03a66ed9004113f64e80b45c8;p=linux-2.6.git

- remove redundant merge conflict
---

diff --git a/kernel/Makefile b/kernel/Makefile
index bd90bd851..2c6ca2026 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -9,20 +9,6 @@ obj-y     = sched.o fork.o exec_domain.o panic.o printk.o profile.o \
 	    rcupdate.o intermodule.o extable.o params.o posix-timers.o \
 	    kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o dump.o
 
-# mod-subdirs := vserver
-
-subdir-y  += vserver
-obj-y	  += vserver/vserver.o
-
-subdir-y	+= vserver
-obj-y	  += vserver/vserver.o
-
-subdir-y	+= vserver
-obj-y	  += vserver/vserver.o
-
-subdir-y	+= vserver
-obj-y	  += vserver/vserver.o
-
 subdir-y	+= vserver
 obj-y	  += vserver/vserver.o