From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Wed, 8 Oct 2008 23:09:22 +0000 (-0500)
Subject: minor fixes
X-Git-Tag: 1.0~3^2~1
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=86ad850e874113d7f5aeb862b64cb222d40e903b

minor fixes
---

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index 210b39a..c62d482 100644
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@ -152,13 +152,10 @@ else
 endif
 
 ifeq ($(LWIP),ON)
-<<<<<<< HEAD:geekos/build/Makefile
+
 	LWIP_OBJS := lwip
 	CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip  -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG
-=======
-	LWIP_OBJS := lwip/*.o
-	CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip  -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG -DLWIP
->>>>>>> 64bit:geekos/build/Makefile
+
 else
 	LWIP_OBJS := 
 	CC_LWIP_OPTS :=