aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-21 15:34:57 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 15:53:46 -0500
commitb40b97ae736cad3084b13d2969b10c474572de89 (patch)
treedd2a4e0a95c1da764a3b17056b5be1a4d631c18d /include/linux/pci.h
parent8c610c120fb6ea279e8d01ce7aa555da29e59374 (diff)
PCI: Remove CONFIG_HOTPLUG ifdefs
Remove conditional code based on CONFIG_HOTPLUG being false. It's always on now in preparation of it going away as an option. 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 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index ee2179546c63..699e9a920eca 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -941,10 +941,8 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev);
941 941
942/* Functions for PCI Hotplug drivers to use */ 942/* Functions for PCI Hotplug drivers to use */
943int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); 943int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap);
944#ifdef CONFIG_HOTPLUG
945unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge); 944unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge);
946unsigned int pci_rescan_bus(struct pci_bus *bus); 945unsigned int pci_rescan_bus(struct pci_bus *bus);
947#endif
948 946
949/* Vital product data routines */ 947/* Vital product data routines */
950ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf); 948ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf);