From: Michal Simek <monstr@monstr.eu>
Date: Mon, 10 Sep 2007 22:29:27 +0000 (+0200)
Subject: Merge git://www.denx.de/git/u-boot
X-Git-Tag: v1.3.0-rc3~5^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c73f4b81172bc9f1b8f132450e69bcfb5b960ca;p=oweals%2Fu-boot.git

Merge git://www.denx.de/git/u-boot
---

9c73f4b81172bc9f1b8f132450e69bcfb5b960ca
diff --cc drivers/net/Makefile
index 7342dc8ce6,37d69b9949..063985984e
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -23,9 -23,9 +23,8 @@@
  
  include $(TOPDIR)/config.mk
  
- LIB 	:= $(obj)libnetdrv.a
- 
- COBJS 	:= xilinx_emaclite.o xilinx_emac.o
+ LIB 	:= $(obj)libnet.a
 -
 -COBJS 	:= mcffec.o
++COBJS 	:= mcffec.o xilinx_emac.o xilinx_emaclite.o
  
  SRCS 	:= $(COBJS:.o=.c)
  OBJS 	:= $(addprefix $(obj),$(COBJS))