diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 17:38:41 +0100 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 17:38:41 +0100 |
| commit | 6d2160bfe7826aca1c94b4bca77093908a452ae7 (patch) | |
| tree | 8153fcd8a7c467e5de136f312e8ef5b27bea9d6b /drivers/pci/hotplug/Makefile | |
| parent | don't reallocate sxp variable passed into xfs_swapext (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| download | linux-6d2160bfe7826aca1c94b4bca77093908a452ae7.tar.xz linux-6d2160bfe7826aca1c94b4bca77093908a452ae7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/pci/hotplug/Makefile')
| -rw-r--r-- | drivers/pci/hotplug/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile index e31fb91652ce..2aa117c8cd87 100644 --- a/drivers/pci/hotplug/Makefile +++ b/drivers/pci/hotplug/Makefile @@ -5,11 +5,15 @@ obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o + +# pciehp should be linked before acpiphp in order to allow the native driver +# to attempt to bind first. We can then fall back to generic support. + +obj-$(CONFIG_HOTPLUG_PCI_PCIE) += pciehp.o obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o obj-$(CONFIG_HOTPLUG_PCI_ACPI_IBM) += acpiphp_ibm.o obj-$(CONFIG_HOTPLUG_PCI_CPCI_ZT5550) += cpcihp_zt5550.o obj-$(CONFIG_HOTPLUG_PCI_CPCI_GENERIC) += cpcihp_generic.o -obj-$(CONFIG_HOTPLUG_PCI_PCIE) += pciehp.o obj-$(CONFIG_HOTPLUG_PCI_SHPC) += shpchp.o obj-$(CONFIG_HOTPLUG_PCI_RPA) += rpaphp.o obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR) += rpadlpar_io.o |