From: Wolfgang Denk <wd@denx.de>
Date: Wed, 18 Apr 2007 15:00:09 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/custodian/u-boot-74xx-7xx
X-Git-Tag: v1.3.0-rc1~109
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=43f6226db002af1d1ff1adf35b422dcce9f76f76;p=u-boot

Merge with /home/wd/git/u-boot/custodian/u-boot-74xx-7xx
---

43f6226db002af1d1ff1adf35b422dcce9f76f76
diff --cc drivers/Makefile
index 2eac7c8485,60ce3b489c..df9fbf2aae
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -32,11 -32,11 +32,11 @@@ COBJS	= 3c589.o 5701rls.o ali512x.o atm
  	  cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
  	  e1000.o eepro100.o \
  	  i8042.o inca-ip_sw.o keyboard.o \
 -	  lan91c96.o \
 +	  lan91c96.o macb.o \
  	  natsemi.o ne2000.o netarm_eth.o netconsole.o \
  	  ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
- 	  omap24xx_i2c.o pci.o pci_auto.o pci_indirect.o \
- 	  pcnet.o plb2800_eth.o \
+ 	  omap24xx_i2c.o pci.o pci_auto.o pci_indirect.o tsi108_pci.o\
+ 	  tsi108_i2c.o pcnet.o plb2800_eth.o \
  	  ps2ser.o ps2mult.o pc_keyb.o \
  	  rtl8019.o rtl8139.o rtl8169.o \
  	  s3c4510b_eth.o s3c4510b_uart.o \