diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-21 15:34:58 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 13:00:58 -0800 |
| commit | 8ccc9aa17a0ccfabf3b2eb31243c3204f81166f6 (patch) | |
| tree | 065092ec1dbac6c0b717ea8291db2b90a4c5b53d /drivers/pci/Makefile | |
| parent | b40b97ae736cad3084b13d2969b10c474572de89 (diff) | |
| download | linux-stable-8ccc9aa17a0ccfabf3b2eb31243c3204f81166f6.tar.gz linux-stable-8ccc9aa17a0ccfabf3b2eb31243c3204f81166f6.tar.bz2 linux-stable-8ccc9aa17a0ccfabf3b2eb31243c3204f81166f6.zip | |
PCI: Move pci_uevent into pci-driver.c
With the demise of CONFIG_HOTPLUG as an option, the pci_uevent
function located in hotplug.c will now always be used and doesn't need
special treatment in the Makefile. Move pci_uevent into pci-driver.c
and remove hotplug.c
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pci/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 8d688b260e28..36f119d9c342 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -15,8 +15,6 @@ obj-$(CONFIG_PCIEPORTBUS) += pcie/ obj-$(CONFIG_PCI_IOAPIC) += ioapic.o -obj-$(CONFIG_HOTPLUG) += hotplug.o - # Build the PCI Hotplug drivers if we were asked to obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ ifdef CONFIG_HOTPLUG_PCI |