Merge branch 'acpi-scan' into acpi-cleanup

The following commits depend on the 'acpi-scan' material.
This commit is contained in:
Rafael J. Wysocki 2013-01-29 13:58:34 +01:00
commit 64e94e7e0f
4 changed files with 21 additions and 27 deletions

View file

@ -386,7 +386,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver);
void acpi_bus_unregister_driver(struct acpi_driver *driver);
int acpi_bus_scan(acpi_handle handle);
void acpi_bus_hot_remove_device(void *context);
int acpi_bus_trim(struct acpi_device *start);
void acpi_bus_trim(struct acpi_device *start);
acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);
int acpi_match_device_ids(struct acpi_device *device,
const struct acpi_device_id *ids);