diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 19:40:13 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 19:40:13 +0200 |
| commit | d785260e2f57d87de5c059de2dabc3cd31b745f0 (patch) | |
| tree | 3218775e396bde8b8139a8c3a01bb95cdc0822c2 /drivers/pci/host/Makefile | |
| parent | Merge branch 'pci/misc' into next (diff) | |
| parent | MAINTAINERS: Add generic PCI host controller driver (diff) | |
| download | linux-d785260e2f57d87de5c059de2dabc3cd31b745f0.tar.xz linux-d785260e2f57d87de5c059de2dabc3cd31b745f0.zip | |
Merge branch 'pci/host-generic' into next
* pci/host-generic:
MAINTAINERS: Add generic PCI host controller driver
PCI: generic: Add generic PCI host controller driver
Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/Makefile
Diffstat (limited to 'drivers/pci/host/Makefile')
| -rw-r--r-- | drivers/pci/host/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile index 19946f9a4521..611ba4b48c94 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o obj-$(CONFIG_PCI_RCAR_GEN2_PCIE) += pcie-rcar.o +obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o |