---

yaml --- r: 310526 b: refs/heads/master c: 7ae3098 h: refs/heads/master v: v3
git-mirror · Jun 4, 2012 · cd0af08 · cd0af08
1 parent 97e9936
commit cd0af08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 */