From: Albert ARIBAUD Date: Wed, 19 Feb 2014 11:04:45 +0000 (+0100) Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' X-Git-Tag: v2014.04-rc2~127^2~1 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e7538fee991308c16f76f7eca2517089f2a30ff4;p=u-boot Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' --- e7538fee991308c16f76f7eca2517089f2a30ff4 diff --cc drivers/pci/Makefile index f0dfb5994c,18458d3d9b..e73a498619 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@@ -10,7 -10,9 +10,8 @@@ obj-$(CONFIG_PCI) += pci.o pci_auto. obj-$(CONFIG_PCI_INDIRECT_BRIDGE) += pci_indirect.o obj-$(CONFIG_PCI_GT64120) += pci_gt64120.o obj-$(CONFIG_PCI_MSC01) += pci_msc01.o + obj-$(CONFIG_PCIE_IMX) += pcie_imx.o obj-$(CONFIG_FTPCI100) += pci_ftpci100.o -obj-$(CONFIG_IXP_PCI) += pci_ixp.o obj-$(CONFIG_SH4_PCI) += pci_sh4.o obj-$(CONFIG_SH7751_PCI) +=pci_sh7751.o obj-$(CONFIG_SH7780_PCI) +=pci_sh7780.o