X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Fbuild%2FMakefile;h=c62d4828591a8f3fb1acae97ead3330aa1348515;hb=2ff2b6c0456f332f5dfbaffdf943c07765709173;hp=210b39a4ae73b82a4d65e71ff2ded1672e742653;hpb=452885dcf15a56694ba283a079877ac38b545b0f;p=palacios.releases.git

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 :=