From: Wolfgang Denk <wd@denx.de>
Date: Tue, 3 Jul 2007 13:07:56 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/custodian/u-boot-testing
X-Git-Tag: v1.3.0-rc1~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=98c440bee623ecdd5322852732b883e696fb2140;p=oweals%2Fu-boot.git

Merge ... /home/wd/git/u-boot/custodian/u-boot-testing
---

98c440bee623ecdd5322852732b883e696fb2140
diff --cc drivers/Makefile
index c7fcc3f23e,8ad530fb2a..48fd4eaade
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -27,10 -27,10 +27,10 @@@ include $(TOPDIR)/config.m
  
  LIB	= $(obj)libdrivers.a
  
- COBJS	= 3c589.o 5701rls.o ali512x.o atmel_usart.o \
+ COBJS	= 3c589.o 5701rls.o ali512x.o ata_piix.o atmel_usart.o \
  	  bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \
  	  cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
 -	  e1000.o eepro100.o \
 +	  e1000.o eepro100.o enc28j60.o \
  	  i8042.o inca-ip_sw.o keyboard.o \
  	  lan91c96.o macb.o \
  	  natsemi.o ne2000.o netarm_eth.o netconsole.o \