Merge branch 'omap-fixes' into fixes

[linux-2.6-omap-h63xx.git] / include / acpi / acutils.h

diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h
index beb07ac83b8aad3a26d13fe216f43763496f80b9..15a838862cd4c33a6646f5dd6e1ef6ae1e34aa4f 100644 (file)
--- a/include/acpi/acutils.h
+++ b/include/acpi/acutils.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -141,8 +141,6 @@ acpi_status acpi_ut_hardware_initialize(void);
 
 void acpi_ut_subsystem_shutdown(void);
 
-acpi_status acpi_ut_validate_fadt(void);
-
 /*
  * utclib - Local implementations of C library functions
  */
@@ -453,6 +451,8 @@ acpi_ut_short_divide(acpi_integer in_dividend,
 /*
  * utmisc
  */
+const char *acpi_ut_validate_exception(acpi_status status);
+
 u8 acpi_ut_is_aml_table(struct acpi_table_header *table);
 
 acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id);
@@ -498,7 +498,8 @@ acpi_ut_display_init_pathname(u8 type,
 acpi_status
 acpi_ut_walk_aml_resources(u8 * aml,
                           acpi_size aml_length,
-                          acpi_walk_aml_callback user_function, void **context);
+                          acpi_walk_aml_callback user_function,
+                          void **context);
 
 acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index);