diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /include/acpi/acpiosxf.h | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/acpi/acpiosxf.h')
| -rw-r--r-- | include/acpi/acpiosxf.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 89bc4a16c2e8..0cd63bce0ae4 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
| @@ -143,8 +143,6 @@ void acpi_os_release_mutex(acpi_mutex handle); | |||
| 143 | */ | 143 | */ |
| 144 | void *acpi_os_allocate(acpi_size size); | 144 | void *acpi_os_allocate(acpi_size size); |
| 145 | 145 | ||
| 146 | void acpi_os_free(void *memory); | ||
| 147 | |||
| 148 | acpi_status | 146 | acpi_status |
| 149 | acpi_os_map_memory(acpi_physical_address physical_address, | 147 | acpi_os_map_memory(acpi_physical_address physical_address, |
| 150 | acpi_size size, void __iomem ** logical_address); | 148 | acpi_size size, void __iomem ** logical_address); |