author | Michal Simek <monstr@monstr.eu> | |
Mon, 10 Sep 2007 22:29:27 +0000 (00:29 +0200) | ||
committer | Michal Simek <monstr@monstr.eu> | |
Mon, 10 Sep 2007 22:29:27 +0000 (00:29 +0200) |
1 | 2 | |||
---|---|---|---|---|
Makefile | patch | | diff1 | | diff2 | | blob | history |
drivers/net/Makefile | patch | | diff1 | | diff2 | | blob | history |
diff --cc Makefile
Simple merge
diff --cc drivers/net/Makefile
index 7342dc8ce6c78ad6a59c9780fbd252e9e8ccff34,37d69b9949bd94d6a97d272f32c6cc626d8b6a99..063985984ebb9c3b5432463eb4eaf4af637a9e13
+++ b/drivers/net/Makefile
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))