git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
include
/
acpi
/
acpiosxf.h
diff --git
a/include/acpi/acpiosxf.h
b/include/acpi/acpiosxf.h
index
a756bc8
..
4543b6f
100644
(file)
--- a/
include/acpi/acpiosxf.h
+++ b/
include/acpi/acpiosxf.h
@@
-98,8
+98,11
@@
acpi_os_table_override(struct acpi_table_header *existing_table,
/*
* Spinlock primitives
*/
+
+#ifndef acpi_os_create_lock
acpi_status
acpi_os_create_lock(acpi_spinlock *out_handle);
+#endif
void acpi_os_delete_lock(acpi_spinlock handle);