This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 8f20bc6..a76c952 100644 (file)
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -176,12 +176,10 @@ acpi_os_unmap_memory (
        void __iomem                  *logical_address,
        acpi_size                       size);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_os_get_physical_address (
        void                            *logical_address,
        acpi_physical_address           *physical_address);
-#endif
 
 
 /*
@@ -218,13 +216,10 @@ void
 acpi_os_wait_events_complete(
        void * context);
 
-void
-acpi_os_wait_events_complete (
-       void                            *context);
-
 void
 acpi_os_sleep (
-       acpi_integer                    milliseconds);
+       u32                             seconds,
+       u32                             milliseconds);
 
 void
 acpi_os_stall (
@@ -304,14 +299,12 @@ acpi_os_readable (
        void                            *pointer,
        acpi_size                       length);
 
-#ifdef ACPI_FUTURE_USAGE
 u8
 acpi_os_writable (
        void                            *pointer,
        acpi_size                       length);
-#endif
 
-u64
+u32
 acpi_os_get_timer (
        void);
 
@@ -343,11 +336,9 @@ acpi_os_redirect_output (
  * Debug input
  */
 
-#ifdef ACPI_FUTURE_USAGE
 u32
 acpi_os_get_line (
        char                            *buffer);
-#endif
 
 
 /*