From 3ae4295ef3bf20a4747a8299b183494891c8582f Mon Sep 17 00:00:00 2001 From: Alex Chiang Date: Fri, 12 Oct 2007 16:20:33 -0700 Subject: [PATCH] --- yaml --- r: 82307 b: refs/heads/master c: 561e55e8e375dd962882cada9001065695724d3a h: refs/heads/master i: 82305: 48469c8fef94e09c4afad528ae23b40afd03da13 82303: e8e7fce6eb94ea72c0b0f88f144c5d49f4e38391 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e6048542c417..d19299475987 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41ece3829f516f0e1f0c25f2c7eafac87e683df4 +refs/heads/master: 561e55e8e375dd962882cada9001065695724d3a diff --git a/trunk/drivers/pci/hotplug/Makefile b/trunk/drivers/pci/hotplug/Makefile index 34a1891191fd..9bdbe1a6688f 100644 --- a/trunk/drivers/pci/hotplug/Makefile +++ b/trunk/drivers/pci/hotplug/Makefile @@ -3,7 +3,6 @@ # obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o -obj-$(CONFIG_HOTPLUG_PCI_FAKE) += fakephp.o obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o @@ -16,6 +15,9 @@ obj-$(CONFIG_HOTPLUG_PCI_RPA) += rpaphp.o obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR) += rpadlpar_io.o obj-$(CONFIG_HOTPLUG_PCI_SGI) += sgi_hotplug.o +# Link this last so it doesn't claim devices that have a real hotplug driver +obj-$(CONFIG_HOTPLUG_PCI_FAKE) += fakephp.o + pci_hotplug-objs := pci_hotplug_core.o ifdef CONFIG_HOTPLUG_PCI_CPCI