From cd0af08314d70eb47b011424ce38e387b779cfb7 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Mon, 4 Jun 2012 00:29:11 -0400 Subject: [PATCH] --- yaml --- r: 310526 b: refs/heads/master c: 7ae30986dc63d214cb075a40f2cf205f0a7806cd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/acpi/acpi_bus.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b92d6694af5..83b589610e93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f07a6134f670755e6ce657d019c26305bfcef89 +refs/heads/master: 7ae30986dc63d214cb075a40f2cf205f0a7806cd diff --git a/trunk/include/acpi/acpi_bus.h b/trunk/include/acpi/acpi_bus.h index b0d62820ada1..9e6e1c6eb60a 100644 --- a/trunk/include/acpi/acpi_bus.h +++ b/trunk/include/acpi/acpi_bus.h @@ -440,8 +440,8 @@ static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable) #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; } +static inline int register_acpi_bus_type(void *bus) { return 0; } +static inline int unregister_acpi_bus_type(void *bus) { return 0; } #endif /* CONFIG_ACPI */