diff options
Diffstat (limited to 'include/acpi/acpixf.h')
-rw-r--r-- | include/acpi/acpixf.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index cc40102fe2f3..aeaf7cd41dc7 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | /* Current ACPICA subsystem version in YYYYMMDD format */ | 48 | /* Current ACPICA subsystem version in YYYYMMDD format */ |
49 | 49 | ||
50 | #define ACPI_CA_VERSION 0x20081204 | 50 | #define ACPI_CA_VERSION 0x20090320 |
51 | 51 | ||
52 | #include "actypes.h" | 52 | #include "actypes.h" |
53 | #include "actbl.h" | 53 | #include "actbl.h" |
@@ -349,17 +349,15 @@ acpi_resource_to_address64(struct acpi_resource *resource, | |||
349 | */ | 349 | */ |
350 | acpi_status acpi_reset(void); | 350 | acpi_status acpi_reset(void); |
351 | 351 | ||
352 | acpi_status acpi_get_register(u32 register_id, u32 * return_value); | 352 | acpi_status acpi_read_bit_register(u32 register_id, u32 *return_value); |
353 | 353 | ||
354 | acpi_status acpi_get_register_unlocked(u32 register_id, u32 *return_value); | 354 | acpi_status acpi_write_bit_register(u32 register_id, u32 value); |
355 | 355 | ||
356 | acpi_status acpi_set_register(u32 register_id, u32 value); | 356 | acpi_status acpi_set_firmware_waking_vector(u32 physical_address); |
357 | 357 | ||
358 | acpi_status | 358 | #if ACPI_MACHINE_WIDTH == 64 |
359 | acpi_set_firmware_waking_vector(u32 physical_address); | 359 | acpi_status acpi_set_firmware_waking_vector64(u64 physical_address); |
360 | 360 | #endif | |
361 | acpi_status | ||
362 | acpi_set_firmware_waking_vector64(u64 physical_address); | ||
363 | 361 | ||
364 | acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg); | 362 | acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg); |
365 | 363 | ||