From: Wolfgang Denk <wd@denx.de>
Date: Fri, 2 Nov 2007 14:09:10 +0000 (+0100)
Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians
X-Git-Tag: v1.3.0-rc4~27^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f0516920f6e048425b005c049378e80d600bd268;p=u-boot

Merge branch 'master' of /home/wd/git/u-boot/custodians
---

f0516920f6e048425b005c049378e80d600bd268
diff --cc drivers/Makefile
index 00978d8285,1889698bca..d19588f3af
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -45,10 -42,10 +45,10 @@@ COBJS	= 3c589.o 5701rls.o ali512x.o at4
  	  s3c4510b_eth.o s3c4510b_uart.o \
  	  sed13806.o sed156x.o \
  	  serial.o serial_max3100.o \
- 	  serial_pl010.o serial_pl011.o serial_xuartlite.o \
+ 	  serial_xuartlite.o \
  	  sil680.o sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
  	  status_led.o sym53c8xx.o systemace.o ahci.o \
 -	  ti_pci1410a.o tigon3.o tsec.o \
 +	  ti_pci1410a.o tigon3.o tqm8xx_pcmcia.o tsec.o \
  	  tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
  	  usb_ohci.o \
  	  usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \