From d3c798fe1ff9f7badc73b15bd12cb3e935978994 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 11 May 2012 16:08:25 +0800 Subject: [PATCH] --- yaml --- r: 303923 b: refs/heads/master c: 66886d6f8c9bcdee3d7fce5796dcffd6b4bc0b48 h: refs/heads/master i: 303921: f2d68ecdda681005bddd8ab3d1777e40e90e2525 303919: 82e5a34f8c54276583d78dcd78e3d312688b0633 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/glue.c | 2 ++ trunk/include/acpi/acpi_bus.h | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9fb0e5ef010d..93501166b90d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2721ea2c0f26bb3a2668541412740497b64be2a2 +refs/heads/master: 66886d6f8c9bcdee3d7fce5796dcffd6b4bc0b48 diff --git a/trunk/drivers/acpi/glue.c b/trunk/drivers/acpi/glue.c index 29a4a5c8ee00..1564e0927c21 100644 --- a/trunk/drivers/acpi/glue.c +++ b/trunk/drivers/acpi/glue.c @@ -69,6 +69,7 @@ static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type) up_read(&bus_type_sem); return ret; } +EXPORT_SYMBOL_GPL(register_acpi_bus_type); static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle) { @@ -85,6 +86,7 @@ static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle) up_read(&bus_type_sem); return ret; } +EXPORT_SYMBOL_GPL(unregister_acpi_bus_type); /* Get device's handler per its address under its parent */ struct acpi_find_child { diff --git a/trunk/include/acpi/acpi_bus.h b/trunk/include/acpi/acpi_bus.h index f1c8ca60e824..c909984d0720 100644 --- a/trunk/include/acpi/acpi_bus.h +++ b/trunk/include/acpi/acpi_bus.h @@ -407,6 +407,11 @@ static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable) } #endif +#else /* CONFIG_ACPI */ + +static int register_acpi_bus_type(struct acpi_bus_type *bus) { return 0; } +static int unregister_acpi_bus_type(struct acpi_bus_type *bus) { return 0; } + #endif /* CONFIG_ACPI */ #endif /*__ACPI_BUS_H__*/