summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:31:17 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:31:17 -0500
commit299cfe38081bea6dcd8b882375f6f65a980bccf9 (patch)
treee567c1e908d158d6dce155cc5cf1b4eb8c78c514 /include/acpi
parent8976b6fd7a0060f72e20d5cec833c03d50874cd1 (diff)
parent443dea72d5f428170de6d6e3c4c1a1e2b7632b65 (diff)
downloadlinux-299cfe38081bea6dcd8b882375f6f65a980bccf9.tar.bz2
Merge branches 'release' and 'hwmon-conflicts' into release
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpiosxf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 1a16cfbe9e0d..022a5fd80c8e 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -242,8 +242,8 @@ acpi_status acpi_os_validate_interface(char *interface);
acpi_status acpi_osi_invalidate(char* interface);
acpi_status
-acpi_os_validate_address(u8 space_id,
- acpi_physical_address address, acpi_size length);
+acpi_os_validate_address(u8 space_id, acpi_physical_address address,
+ acpi_size length, char *name);
u64 acpi_os_get_timer(void);