diff options
author | Matthew Garrett <mjg@redhat.com> | 2012-05-11 04:08:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-11 20:03:12 -0400 |
commit | 66886d6f8c9bcdee3d7fce5796dcffd6b4bc0b48 (patch) | |
tree | a5e362f9946b718a3658d7c3c9cd93b6a90a0319 | |
parent | 2721ea2c0f26bb3a2668541412740497b64be2a2 (diff) |
ACPI: Add stubs for (un)register_acpi_bus_type
It's unreasonable to have CONFIG_ACPI for these in drivers, so add some
stub functions.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/acpi/glue.c | 2 | ||||
-rw-r--r-- | include/acpi/acpi_bus.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 29a4a5c8ee00..1564e0927c21 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
@@ -69,6 +69,7 @@ static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type) | |||
69 | up_read(&bus_type_sem); | 69 | up_read(&bus_type_sem); |
70 | return ret; | 70 | return ret; |
71 | } | 71 | } |
72 | EXPORT_SYMBOL_GPL(register_acpi_bus_type); | ||
72 | 73 | ||
73 | static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle) | 74 | static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle) |
74 | { | 75 | { |
@@ -85,6 +86,7 @@ static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle) | |||
85 | up_read(&bus_type_sem); | 86 | up_read(&bus_type_sem); |
86 | return ret; | 87 | return ret; |
87 | } | 88 | } |
89 | EXPORT_SYMBOL_GPL(unregister_acpi_bus_type); | ||
88 | 90 | ||
89 | /* Get device's handler per its address under its parent */ | 91 | /* Get device's handler per its address under its parent */ |
90 | struct acpi_find_child { | 92 | struct acpi_find_child { |
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index f1c8ca60e824..c909984d0720 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -407,6 +407,11 @@ static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable) | |||
407 | } | 407 | } |
408 | #endif | 408 | #endif |
409 | 409 | ||
410 | #else /* CONFIG_ACPI */ | ||
411 | |||
412 | static int register_acpi_bus_type(struct acpi_bus_type *bus) { return 0; } | ||
413 | static int unregister_acpi_bus_type(struct acpi_bus_type *bus) { return 0; } | ||
414 | |||
410 | #endif /* CONFIG_ACPI */ | 415 | #endif /* CONFIG_ACPI */ |
411 | 416 | ||
412 | #endif /*__ACPI_BUS_H__*/ | 417 | #endif /*__ACPI_BUS_H__*/ |