From: roy zang <tie-fei.zang@freescale.com>
Date: Wed, 28 Feb 2007 08:46:48 +0000 (+0800)
Subject: Merge branch 'master' into hpc2
X-Git-Tag: v1.3.0-rc1~109^2~3^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=00b574bdc8c54dbc9e03f63c24f62955d483e3ef;p=u-boot

Merge branch 'master' into hpc2

Conflicts:

	drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
---

00b574bdc8c54dbc9e03f63c24f62955d483e3ef
diff --cc drivers/Makefile
index 6a3ea5da25,fffc22a5e1..60ce3b489c
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -44,8 -44,8 +44,8 @@@ COBJS	= 3c589.o 5701rls.o ali512x.o atm
  	  serial.o serial_max3100.o \
  	  serial_pl010.o serial_pl011.o serial_xuartlite.o \
  	  sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
- 	  status_led.o sym53c8xx.o ahci.o \
+ 	  status_led.o sym53c8xx.o systemace.o ahci.o \
 -	  ti_pci1410a.o tigon3.o tsec.o \
 +	  ti_pci1410a.o tigon3.o tsec.o tsi108_eth.o\
  	  usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
  	  videomodes.o w83c553f.o \
  	  ks8695eth.o \