Merge branches 'release' and 'hwmon-conflicts' into release

[linux-2.6] / include / acpi / acpiosxf.h

diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 1a16cfbe9e0d39b2d07cbda2bd5f2cd69e42466f..022a5fd80c8e60deee43bddd7aacda0bd45a4420 100644 (file)
--- 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);