diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:44:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:44:43 +0200 |
| commit | 10a0d912898ac2fe49094acf2c1339d0fb4c2bc6 (patch) | |
| tree | ca87b31c5b958599b313e40cc141748664687c51 /include | |
| parent | parport: Use the PCI IRQ if offered (diff) | |
| parent | hwmon: Add Asus ATK0110 support (diff) | |
| download | linux-10a0d912898ac2fe49094acf2c1339d0fb4c2bc6.tar.xz linux-10a0d912898ac2fe49094acf2c1339d0fb4c2bc6.zip | |
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
hwmon: Add Asus ATK0110 support
hwmon: (lm95241) Convert to new-style i2c driver
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpixf.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index aeaf7cd41dc7..4db89e98535d 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -191,14 +191,12 @@ acpi_evaluate_object(acpi_handle object, struct acpi_object_list *parameter_objects, struct acpi_buffer *return_object_buffer); -#ifdef ACPI_FUTURE_USAGE acpi_status acpi_evaluate_object_typed(acpi_handle object, acpi_string pathname, struct acpi_object_list *external_params, struct acpi_buffer *return_buffer, acpi_object_type return_type); -#endif acpi_status acpi_get_object_info(acpi_handle handle, struct acpi_buffer *return_buffer); |