Merge branch 'linus' into release

This commit is contained in:
Len Brown
2009-01-09 03:39:43 -05:00
7966 changed files with 919262 additions and 223615 deletions

View File

@@ -227,6 +227,8 @@ extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
struct hotplug_params *hpp);
int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);
int acpi_root_bridge(acpi_handle handle);
int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);
int acpi_pci_detect_ejectable(struct pci_bus *pbus);
#endif
#endif