diff options
author | Len Brown <len.brown@intel.com> | 2008-10-23 05:33:29 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-23 05:33:29 +0200 |
commit | 7674416db4ee3d43813dddb650364ca994755256 (patch) | |
tree | 1a4549823d7bdd892dc3b3b7b3fa9214216ac384 /include | |
parent | Merge branch 'thinkpad' into test (diff) | |
parent | ACPI: Change acpi_evaluate_integer to support 64-bit on 32-bit kernels (diff) | |
download | linux-7674416db4ee3d43813dddb650364ca994755256.tar.xz linux-7674416db4ee3d43813dddb650364ca994755256.zip |
Merge branch 'ull' into test
Conflicts:
drivers/acpi/bay.c
drivers/acpi/dock.c
drivers/ata/libata-acpi.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index c1b5556c985d..54a279e44c9a 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -46,7 +46,7 @@ acpi_extract_package(union acpi_object *package, acpi_status acpi_evaluate_integer(acpi_handle handle, acpi_string pathname, - struct acpi_object_list *arguments, unsigned long *data); + struct acpi_object_list *arguments, unsigned long long *data); acpi_status acpi_evaluate_reference(acpi_handle handle, acpi_string pathname, |