summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:19:43 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:19:43 -0500
commit060195500e0347a6ba8ea89739a9898961eb6f2b (patch)
tree5afba4e8daae642d33b7a4daa97d63c54776b786 /include/linux/acpi.h
parent26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7 (diff)
parentdd8cd7793781c87be47bbfee65efa3fb5110f898 (diff)
downloadlinux-060195500e0347a6ba8ea89739a9898961eb6f2b.tar.gz
linux-060195500e0347a6ba8ea89739a9898961eb6f2b.tar.bz2
linux-060195500e0347a6ba8ea89739a9898961eb6f2b.zip
Merge branches 'release' and 'wmi-2.6.25' into release
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index cf13bec517b7..5a5a13b64d09 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -193,6 +193,26 @@ extern int ec_transaction(u8 command,
#endif /*CONFIG_ACPI_EC*/
+#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
+
+typedef void (*wmi_notify_handler) (u32 value, void *context);
+
+extern acpi_status wmi_evaluate_method(const char *guid, u8 instance,
+ u32 method_id,
+ const struct acpi_buffer *in,
+ struct acpi_buffer *out);
+extern acpi_status wmi_query_block(const char *guid, u8 instance,
+ struct acpi_buffer *out);
+extern acpi_status wmi_set_block(const char *guid, u8 instance,
+ const struct acpi_buffer *in);
+extern acpi_status wmi_install_notify_handler(const char *guid,
+ wmi_notify_handler handler, void *data);
+extern acpi_status wmi_remove_notify_handler(const char *guid);
+extern acpi_status wmi_get_event_data(u32 event, struct acpi_buffer *out);
+extern bool wmi_has_guid(const char *guid);
+
+#endif /* CONFIG_ACPI_WMI */
+
extern int acpi_blacklisted(void);
#ifdef CONFIG_DMI
extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);