diff options
| author | Len Brown <len.brown@intel.com> | 2007-10-10 01:00:45 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-10 01:00:45 -0400 |
| commit | 00a2b433557f10736e8a02de619b3e9052556c12 (patch) | |
| tree | dec892a10006763f7b7c3818a0099bb7730793da /include/acpi | |
| parent | de85871a9a53c00cae4c3a70849b5eaad0eb38b2 (diff) | |
| parent | 2d571b33cf7efd6a894e765e3cb45587ec5b834a (diff) | |
| download | linux-stable-00a2b433557f10736e8a02de619b3e9052556c12.tar.gz linux-stable-00a2b433557f10736e8a02de619b3e9052556c12.tar.bz2 linux-stable-00a2b433557f10736e8a02de619b3e9052556c12.zip | |
Pull acpica into test branch
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/achware.h | 4 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/acpi/achware.h b/include/acpi/achware.h index 9df275cf7bc1..4053df943453 100644 --- a/include/acpi/achware.h +++ b/include/acpi/achware.h @@ -71,9 +71,9 @@ u32 acpi_hw_get_mode(void); struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id); acpi_status -acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value); +acpi_hw_register_read(u32 register_id, u32 * return_value); -acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value); +acpi_status acpi_hw_register_write(u32 register_id, u32 value); acpi_status acpi_hw_low_level_read(u32 width, diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 3d7ab9e0c9fe..9512f0456ad1 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -314,6 +314,8 @@ acpi_resource_to_address64(struct acpi_resource *resource, */ acpi_status acpi_get_register(u32 register_id, u32 * return_value); +acpi_status acpi_get_register_unlocked(u32 register_id, u32 *return_value); + acpi_status acpi_set_register(u32 register_id, u32 value); acpi_status |