diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_hotplug.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h index 1f5c935eb0de..4c378368215c 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h | |||
| @@ -164,6 +164,7 @@ struct hotplug_params { | |||
| 164 | int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp); | 164 | int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp); |
| 165 | bool pciehp_is_native(struct pci_dev *bridge); | 165 | bool pciehp_is_native(struct pci_dev *bridge); |
| 166 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *bridge); | 166 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *bridge); |
| 167 | bool shpchp_is_native(struct pci_dev *bridge); | ||
| 167 | int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); | 168 | int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); |
| 168 | int acpi_pci_detect_ejectable(acpi_handle handle); | 169 | int acpi_pci_detect_ejectable(acpi_handle handle); |
| 169 | #else | 170 | #else |
| @@ -178,5 +179,6 @@ static inline int acpi_get_hp_hw_control_from_firmware(struct pci_dev *bridge) | |||
| 178 | return 0; | 179 | return 0; |
| 179 | } | 180 | } |
| 180 | static inline bool pciehp_is_native(struct pci_dev *bridge) { return true; } | 181 | static inline bool pciehp_is_native(struct pci_dev *bridge) { return true; } |
| 182 | static inline bool shpchp_is_native(struct pci_dev *bridge) { return true; } | ||
| 181 | #endif | 183 | #endif |
| 182 | #endif | 184 | #endif |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 883cb7bf78aa..5aace6cca0d7 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -561,6 +561,7 @@ | |||
| 561 | #define PCI_DEVICE_ID_AMD_OPUS_7443 0x7443 | 561 | #define PCI_DEVICE_ID_AMD_OPUS_7443 0x7443 |
| 562 | #define PCI_DEVICE_ID_AMD_VIPER_7443 0x7443 | 562 | #define PCI_DEVICE_ID_AMD_VIPER_7443 0x7443 |
| 563 | #define PCI_DEVICE_ID_AMD_OPUS_7445 0x7445 | 563 | #define PCI_DEVICE_ID_AMD_OPUS_7445 0x7445 |
| 564 | #define PCI_DEVICE_ID_AMD_GOLAM_7450 0x7450 | ||
| 564 | #define PCI_DEVICE_ID_AMD_8111_PCI 0x7460 | 565 | #define PCI_DEVICE_ID_AMD_8111_PCI 0x7460 |
| 565 | #define PCI_DEVICE_ID_AMD_8111_LPC 0x7468 | 566 | #define PCI_DEVICE_ID_AMD_8111_LPC 0x7468 |
| 566 | #define PCI_DEVICE_ID_AMD_8111_IDE 0x7469 | 567 | #define PCI_DEVICE_ID_AMD_8111_IDE 0x7469 |
