diff options
Diffstat (limited to 'include/linux/pci_hotplug.h')
| -rw-r--r-- | include/linux/pci_hotplug.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h index 4391741b99dc..652ba797696d 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h | |||
| @@ -62,7 +62,8 @@ enum pcie_link_width { | |||
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | enum pcie_link_speed { | 64 | enum pcie_link_speed { |
| 65 | PCIE_2PT5GB = 0x14, | 65 | PCIE_2_5GB = 0x14, |
| 66 | PCIE_5_0GB = 0x15, | ||
| 66 | PCIE_LNK_SPEED_UNKNOWN = 0xFF, | 67 | PCIE_LNK_SPEED_UNKNOWN = 0xFF, |
| 67 | }; | 68 | }; |
| 68 | 69 | ||
| @@ -226,11 +227,18 @@ struct hotplug_params { | |||
| 226 | #ifdef CONFIG_ACPI | 227 | #ifdef CONFIG_ACPI |
| 227 | #include <acpi/acpi.h> | 228 | #include <acpi/acpi.h> |
| 228 | #include <acpi/acpi_bus.h> | 229 | #include <acpi/acpi_bus.h> |
| 229 | extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, | 230 | int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp); |
| 230 | struct hotplug_params *hpp); | ||
| 231 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); | 231 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); |
| 232 | int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); | 232 | int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); |
| 233 | int acpi_pci_detect_ejectable(struct pci_bus *pbus); | 233 | int acpi_pci_detect_ejectable(acpi_handle handle); |
| 234 | #else | ||
| 235 | static inline int pci_get_hp_params(struct pci_dev *dev, | ||
| 236 | struct hotplug_params *hpp) | ||
| 237 | { | ||
| 238 | return -ENODEV; | ||
| 239 | } | ||
| 234 | #endif | 240 | #endif |
| 241 | |||
| 242 | void pci_configure_slot(struct pci_dev *dev); | ||
| 235 | #endif | 243 | #endif |
| 236 | 244 | ||
