diff options
author | Len Brown <len.brown@intel.com> | 2007-06-02 01:02:09 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-06-02 01:02:09 -0400 |
commit | c4d36a822e7c51cd6ffcf9133854d5e32489d269 (patch) | |
tree | 4c1f8d3f18fd03cb5763520c90b8b9c7c11510b3 /include | |
parent | fcf75356e9cf0460ef47a5b756bc3b0951ecab59 (diff) | |
parent | dd272b5716a54afa33a69f2241284d8ec60b7892 (diff) |
Pull osi-now into release branch
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpiosxf.h | 3 | ||||
-rw-r--r-- | include/acpi/acpixf.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 5e07db0d46e9..ca882b8e7d10 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
@@ -78,7 +78,7 @@ struct acpi_signal_fatal_info { | |||
78 | /* | 78 | /* |
79 | * OSL Initialization and shutdown primitives | 79 | * OSL Initialization and shutdown primitives |
80 | */ | 80 | */ |
81 | acpi_status acpi_os_initialize(void); | 81 | acpi_status __initdata acpi_os_initialize(void); |
82 | 82 | ||
83 | acpi_status acpi_os_terminate(void); | 83 | acpi_status acpi_os_terminate(void); |
84 | 84 | ||
@@ -236,6 +236,7 @@ acpi_os_derive_pci_id(acpi_handle rhandle, | |||
236 | * Miscellaneous | 236 | * Miscellaneous |
237 | */ | 237 | */ |
238 | acpi_status acpi_os_validate_interface(char *interface); | 238 | acpi_status acpi_os_validate_interface(char *interface); |
239 | acpi_status acpi_osi_invalidate(char* interface); | ||
239 | 240 | ||
240 | acpi_status | 241 | acpi_status |
241 | acpi_os_validate_address(u8 space_id, | 242 | acpi_os_validate_address(u8 space_id, |
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index e08f7df85a4f..b5cca5daa348 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
@@ -55,7 +55,7 @@ acpi_status | |||
55 | acpi_initialize_tables(struct acpi_table_desc *initial_storage, | 55 | acpi_initialize_tables(struct acpi_table_desc *initial_storage, |
56 | u32 initial_table_count, u8 allow_resize); | 56 | u32 initial_table_count, u8 allow_resize); |
57 | 57 | ||
58 | acpi_status acpi_initialize_subsystem(void); | 58 | acpi_status __init acpi_initialize_subsystem(void); |
59 | 59 | ||
60 | acpi_status acpi_enable_subsystem(u32 flags); | 60 | acpi_status acpi_enable_subsystem(u32 flags); |
61 | 61 | ||