From: Markus Klotzbuecher <mk@denx.de>
Date: Mon, 23 Apr 2007 11:17:22 +0000 (+0200)
Subject: Merge with git://www.denx.de/git/u-boot.git
X-Git-Tag: v1.3.0-rc1~19^2~20^2~12^2~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=61ea75aa07838435ec570ac85a2e3fc038844596;p=u-boot

Merge with git://www.denx.de/git/u-boot.git
---

61ea75aa07838435ec570ac85a2e3fc038844596
diff --cc cpu/ppc4xx/Makefile
index 1347e0f9f0,4068b53208..66fd02ccd8
--- a/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
@@@ -27,12 -27,12 +27,12 @@@ LIB	= $(obj)lib$(CPU).
  
  START	= start.o resetvec.o kgdb.o
  SOBJS	= dcr.o
 -COBJS	= 405gp_pci.o 4xx_enet.o \
 +COBJS	= 405gp_pci.o 440spe_pcie.o 4xx_enet.o \
  	  bedbug_405.o commproc.o \
- 	  cpu.o cpu_init.o i2c.o interrupts.o \
+ 	  cpu.o cpu_init.o gpio.o i2c.o interrupts.o \
  	  miiphy.o ndfc.o sdram.o serial.o \
  	  40x_spd_sdram.o 44x_spd_ddr.o 44x_spd_ddr2.o speed.o \
 -	  tlb.o traps.o usb_ohci.o usbdev.o \
 +	  tlb.o traps.o usb_ohci.o usbdev.o usb.o \
  	  440spe_pcie.o
  
  SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --cc drivers/Makefile
index 52cd388a0a,d68cba682b..b8dc97b0aa
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -31,8 -31,8 +31,8 @@@ COBJS	= 3c589.o 5701rls.o ali512x.o atm
  	  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 \
 -	  i8042.o inca-ip_sw.o keyboard.o \
 -	  lan91c96.o macb.o \
 +	  i8042.o inca-ip_sw.o isp116x-hcd.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 \
@@@ -46,9 -46,8 +46,10 @@@
  	  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 \
+ 	  tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
 -	  usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
 +	  usb_ohci.o \
 +	  usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \
 +	  usbtty.o \
  	  videomodes.o w83c553f.o \
  	  ks8695eth.o \
  	  pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o	\