commit 40277b3d55ec941b5a64f5ed9f6f6f36d7a3b385
author Michal Simek <monstr@monstr.eu> Sat Sep 15 00:03:35 2007 +0200
committer Michal Simek <monstr@monstr.eu> Sat Sep 15 00:03:35 2007 +0200
tree 2c54f0a438a5ca915d88f8badab217b8ae993f11
parent 461107254fa5350facca0b1182f6d19247408d13

Synchronize with U-BOOT mainline

drivers/net/Makefile

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0639859..37d69b9 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -24,7 +24,8 @@
 include $(TOPDIR)/config.mk
 
 LIB 	:= $(obj)libnet.a
-COBJS 	:= mcffec.o xilinx_emac.o xilinx_emaclite.o
+
+COBJS 	:= mcffec.o
 
 SRCS 	:= $(COBJS:.o=.c)
 OBJS 	:= $(addprefix $(obj),$(COBJS))

drivers/serial_xuartlite.c

diff --git a/drivers/serial_xuartlite.c b/drivers/serial_xuartlite.c
index 1f3aaae..ed59abe 100644
--- a/drivers/serial_xuartlite.c
+++ b/drivers/serial_xuartlite.c
@@ -24,7 +24,7 @@
 
 #include <config.h>
 
-#ifdef	XILINX_UARTLITE
+#ifdef	CONFIG_MICROBLAZE
 
 #include <asm/serial_xuartlite.h>