diff options
| author | Alex Chiang <achiang@hp.com> | 2007-10-12 19:20:33 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 18:04:20 -0500 |
| commit | 561e55e8e375dd962882cada9001065695724d3a (patch) | |
| tree | f32417c7bf1709493aa1d7272abce5a9f56d1767 | |
| parent | 41ece3829f516f0e1f0c25f2c7eafac87e683df4 (diff) | |
PCI: hotplug: Link fakephp last
Currently, fakephp will claim all devices; we really only want it
to claim those not in slots.
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/pci/hotplug/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile index 34a1891191fd..9bdbe1a6688f 100644 --- a/drivers/pci/hotplug/Makefile +++ b/drivers/pci/hotplug/Makefile | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o | 5 | obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o |
| 6 | obj-$(CONFIG_HOTPLUG_PCI_FAKE) += fakephp.o | ||
| 7 | obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o | 6 | obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o |
| 8 | obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o | 7 | obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o |
| 9 | obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o | 8 | obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o |
| @@ -16,6 +15,9 @@ obj-$(CONFIG_HOTPLUG_PCI_RPA) += rpaphp.o | |||
| 16 | obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR) += rpadlpar_io.o | 15 | obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR) += rpadlpar_io.o |
| 17 | obj-$(CONFIG_HOTPLUG_PCI_SGI) += sgi_hotplug.o | 16 | obj-$(CONFIG_HOTPLUG_PCI_SGI) += sgi_hotplug.o |
| 18 | 17 | ||
| 18 | # Link this last so it doesn't claim devices that have a real hotplug driver | ||
| 19 | obj-$(CONFIG_HOTPLUG_PCI_FAKE) += fakephp.o | ||
| 20 | |||
| 19 | pci_hotplug-objs := pci_hotplug_core.o | 21 | pci_hotplug-objs := pci_hotplug_core.o |
| 20 | 22 | ||
| 21 | ifdef CONFIG_HOTPLUG_PCI_CPCI | 23 | ifdef CONFIG_HOTPLUG_PCI_CPCI |
