git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
acpi
/
acpiosxf.h
diff --git
a/include/acpi/acpiosxf.h
b/include/acpi/acpiosxf.h
index
a76c952
..
857c807
100644
(file)
--- a/
include/acpi/acpiosxf.h
+++ b/
include/acpi/acpiosxf.h
@@
-9,7
+9,7
@@
/*
/*
- * Copyright (C) 2000 - 200
4
, R. Byron Moore
+ * Copyright (C) 2000 - 200
5
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-176,10
+176,12
@@
acpi_os_unmap_memory (
void __iomem *logical_address,
acpi_size size);
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);
acpi_status
acpi_os_get_physical_address (
void *logical_address,
acpi_physical_address *physical_address);
+#endif
/*
/*
@@
-216,10
+218,13
@@
void
acpi_os_wait_events_complete(
void * context);
acpi_os_wait_events_complete(
void * context);
+void
+acpi_os_wait_events_complete (
+ void *context);
+
void
acpi_os_sleep (
void
acpi_os_sleep (
- u32 seconds,
- u32 milliseconds);
+ acpi_integer milliseconds);
void
acpi_os_stall (
void
acpi_os_stall (
@@
-299,12
+304,14
@@
acpi_os_readable (
void *pointer,
acpi_size length);
void *pointer,
acpi_size length);
+#ifdef ACPI_FUTURE_USAGE
u8
acpi_os_writable (
void *pointer,
acpi_size length);
u8
acpi_os_writable (
void *pointer,
acpi_size length);
+#endif
-u
32
+u
64
acpi_os_get_timer (
void);
acpi_os_get_timer (
void);
@@
-336,9
+343,11
@@
acpi_os_redirect_output (
* Debug input
*/
* Debug input
*/
+#ifdef ACPI_FUTURE_USAGE
u32
acpi_os_get_line (
char *buffer);
u32
acpi_os_get_line (
char *buffer);
+#endif
/*
/*