diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-21 15:34:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 15:53:46 -0500 |
commit | b40b97ae736cad3084b13d2969b10c474572de89 (patch) | |
tree | dd2a4e0a95c1da764a3b17056b5be1a4d631c18d /drivers/pci/pci.h | |
parent | 8c610c120fb6ea279e8d01ce7aa555da29e59374 (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 'drivers/pci/pci.h')
-rw-r--r-- | drivers/pci/pci.h | 4 |
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) | |||
159 | } | 159 | } |
160 | extern struct device_attribute pci_dev_attrs[]; | 160 | extern struct device_attribute pci_dev_attrs[]; |
161 | extern struct device_attribute pcibus_dev_attrs[]; | 161 | extern struct device_attribute pcibus_dev_attrs[]; |
162 | #ifdef CONFIG_HOTPLUG | ||
163 | extern struct bus_attribute pci_bus_attrs[]; | 162 | extern struct bus_attribute pci_bus_attrs[]; |
164 | #else | ||
165 | #define pci_bus_attrs NULL | ||
166 | #endif | ||
167 | 163 | ||
168 | 164 | ||
169 | /** | 165 | /** |