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

[u-boot] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index d68cba682be295949d15c3635896a6c944849531..b8dc97b0aae9c6b8fc304709fcc8919c0a7e5205 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -31,8 +31,8 @@ COBJS = 3c589.o 5701rls.o ali512x.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 \
-         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 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 \
@@ -47,7 +47,9 @@ COBJS = 3c589.o 5701rls.o ali512x.o atmel_usart.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  \