diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-09-16 20:32:10 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-09-16 20:32:10 +0200 |
| commit | 7201cfc4a79c0f55f5ebee73c5a626a49cb53f73 (patch) | |
| tree | 2c54f0a438a5ca915d88f8badab217b8ae993f11 /drivers | |
| parent | fd64975a882ca654f3139385791cdd237d6acc53 (diff) | |
| parent | 991b089d1ce5ad945725e3657a8f106dfa02a38e (diff) | |
| download | u-boot-imx-7201cfc4a79c0f55f5ebee73c5a626a49cb53f73.zip u-boot-imx-7201cfc4a79c0f55f5ebee73c5a626a49cb53f73.tar.gz u-boot-imx-7201cfc4a79c0f55f5ebee73c5a626a49cb53f73.tar.bz2 | |
Merge branch 'master' of /home/uboot/070912/u-boot-microblaze/
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/Makefile | 3 | ||||
| -rw-r--r-- | drivers/serial_xuartlite.c | 2 |
2 files changed, 3 insertions, 2 deletions
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)) 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> |