diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /include/linux/pci_hotplug.h | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'include/linux/pci_hotplug.h')
| -rw-r--r-- | include/linux/pci_hotplug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h index c2d1a7d1886a..20998746518e 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h | |||
| @@ -227,6 +227,8 @@ extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, | |||
| 227 | struct hotplug_params *hpp); | 227 | struct hotplug_params *hpp); |
| 228 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); | 228 | int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); |
| 229 | int acpi_root_bridge(acpi_handle handle); | 229 | int acpi_root_bridge(acpi_handle handle); |
| 230 | int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); | ||
| 231 | int acpi_pci_detect_ejectable(struct pci_bus *pbus); | ||
| 230 | #endif | 232 | #endif |
| 231 | #endif | 233 | #endif |
| 232 | 234 | ||