diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
| commit | 7e31842441776b4d6ec7fd916c91663ad05b7814 (patch) | |
| tree | 8d97d41b4f6861dcbc0dc3ac96fab7afddbed731 /include/acpi/acpiosxf.h | |
| parent | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b (diff) | |
| parent | b1d248d96c71665c79befb81207f38f894c7c082 (diff) | |
Merge branch 'misc' into release
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 43027432a055..65b3f5888f42 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
| @@ -98,8 +98,6 @@ acpi_os_table_override(struct acpi_table_header *existing_table, | |||
| 98 | /* | 98 | /* |
| 99 | * Spinlock primitives | 99 | * Spinlock primitives |
| 100 | */ | 100 | */ |
| 101 | acpi_status acpi_os_create_lock(acpi_spinlock * out_handle); | ||
| 102 | |||
| 103 | void acpi_os_delete_lock(acpi_spinlock handle); | 101 | void acpi_os_delete_lock(acpi_spinlock handle); |
| 104 | 102 | ||
| 105 | acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock handle); | 103 | acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock handle); |