summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.h
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-21 21:34:57 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 21:53:46 +0100
commitb40b97ae736cad3084b13d2969b10c474572de89 (patch)
treedd2a4e0a95c1da764a3b17056b5be1a4d631c18d /drivers/pci/pci.h
parentunicore32/PCI: Remove CONFIG_HOTPLUG ifdefs (diff)
downloadlinux-b40b97ae736cad3084b13d2969b10c474572de89.tar.xz
linux-b40b97ae736cad3084b13d2969b10c474572de89.zip
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 'drivers/pci/pci.h')
-rw-r--r--drivers/pci/pci.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index fd92aab9904b..6e993af4d30b 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -159,11 +159,7 @@ static inline int pci_no_d1d2(struct pci_dev *dev)
}
extern struct device_attribute pci_dev_attrs[];
extern struct device_attribute pcibus_dev_attrs[];
-#ifdef CONFIG_HOTPLUG
extern struct bus_attribute pci_bus_attrs[];
-#else
-#define pci_bus_attrs NULL
-#endif
/**