summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-29 13:58:34 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-29 13:58:34 +0100
commit64e94e7e0ffb20ee11a596aa04fcdeefb33e000d (patch)
tree9ef0331d6c207b54502906c239b40220e8113502 /include/acpi
parent2c0d4fe0189ae5e29fd9602d5b83f3b2b169bd1b (diff)
parentc511cc1990bbc263c3f8a2ef4d7d613a3b40ffe2 (diff)
Merge branch 'acpi-scan' into acpi-cleanup
The following commits depend on the 'acpi-scan' material.
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index fc76b1f7ef0..ad0a86ac5cc 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -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);