diff options
-rw-r--r-- | drivers/acpi/scan.c | 5 | ||||
-rw-r--r-- | include/acpi/acpi_bus.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 9271e5209ac..a0ab828b2cc 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -23,7 +23,6 @@ static LIST_HEAD(acpi_device_list); | |||
23 | DEFINE_SPINLOCK(acpi_device_lock); | 23 | DEFINE_SPINLOCK(acpi_device_lock); |
24 | LIST_HEAD(acpi_wakeup_device_list); | 24 | LIST_HEAD(acpi_wakeup_device_list); |
25 | 25 | ||
26 | static int acpi_bus_trim(struct acpi_device *start, int rmdevice); | ||
27 | 26 | ||
28 | static void acpi_device_release(struct kobject *kobj) | 27 | static void acpi_device_release(struct kobject *kobj) |
29 | { | 28 | { |
@@ -1284,7 +1283,7 @@ int acpi_bus_start(struct acpi_device *device) | |||
1284 | 1283 | ||
1285 | EXPORT_SYMBOL(acpi_bus_start); | 1284 | EXPORT_SYMBOL(acpi_bus_start); |
1286 | 1285 | ||
1287 | static int acpi_bus_trim(struct acpi_device *start, int rmdevice) | 1286 | int acpi_bus_trim(struct acpi_device *start, int rmdevice) |
1288 | { | 1287 | { |
1289 | acpi_status status; | 1288 | acpi_status status; |
1290 | struct acpi_device *parent, *child; | 1289 | struct acpi_device *parent, *child; |
@@ -1337,6 +1336,8 @@ static int acpi_bus_trim(struct acpi_device *start, int rmdevice) | |||
1337 | } | 1336 | } |
1338 | return err; | 1337 | return err; |
1339 | } | 1338 | } |
1339 | EXPORT_SYMBOL_GPL(acpi_bus_trim); | ||
1340 | |||
1340 | 1341 | ||
1341 | static int acpi_bus_scan_fixed(struct acpi_device *root) | 1342 | static int acpi_bus_scan_fixed(struct acpi_device *root) |
1342 | { | 1343 | { |
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 0b54e9a4a8a..e496fac860a 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -330,6 +330,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver); | |||
330 | int acpi_bus_unregister_driver(struct acpi_driver *driver); | 330 | int acpi_bus_unregister_driver(struct acpi_driver *driver); |
331 | int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, | 331 | int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, |
332 | acpi_handle handle, int type); | 332 | acpi_handle handle, int type); |
333 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); | ||
333 | int acpi_bus_start(struct acpi_device *device); | 334 | int acpi_bus_start(struct acpi_device *device); |
334 | 335 | ||
335 | int acpi_match_ids(struct acpi_device *device, char *ids); | 336 | int acpi_match_ids(struct acpi_device *device, char *ids); |