diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /include/acpi/acpiosxf.h | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'include/acpi/acpiosxf.h')
| -rw-r--r-- | include/acpi/acpiosxf.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index ab0b85cf21f..eb0e7189075 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
| @@ -245,6 +245,9 @@ acpi_status acpi_osi_invalidate(char* interface); | |||
| 245 | acpi_status | 245 | acpi_status |
| 246 | acpi_os_validate_address(u8 space_id, acpi_physical_address address, | 246 | acpi_os_validate_address(u8 space_id, acpi_physical_address address, |
| 247 | acpi_size length, char *name); | 247 | acpi_size length, char *name); |
| 248 | acpi_status | ||
| 249 | acpi_os_invalidate_address(u8 space_id, acpi_physical_address address, | ||
| 250 | acpi_size length); | ||
| 248 | 251 | ||
| 249 | u64 acpi_os_get_timer(void); | 252 | u64 acpi_os_get_timer(void); |
| 250 | 253 | ||