summaryrefslogtreecommitdiff
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-26 22:51:00 +0400
committerLen Brown <len.brown@intel.com>2010-10-26 22:51:00 +0400
commit7e31842441776b4d6ec7fd916c91663ad05b7814 (patch)
tree8d97d41b4f6861dcbc0dc3ac96fab7afddbed731 /drivers/acpi/osl.c
parent1bd64d42abdd4f9d44f77011a31f0292112f4c3b (diff)
parentb1d248d96c71665c79befb81207f38f894c7c082 (diff)
downloadlinux-7e31842441776b4d6ec7fd916c91663ad05b7814.tar.xz
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r--drivers/acpi/osl.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 0c2e445410ab..966feddf6b1b 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -875,16 +875,6 @@ void acpi_os_wait_events_complete(void *context)
EXPORT_SYMBOL(acpi_os_wait_events_complete);
/*
- * Allocate the memory for a spinlock and initialize it.
- */
-acpi_status acpi_os_create_lock(acpi_spinlock * handle)
-{
- spin_lock_init(*handle);
-
- return AE_OK;
-}
-
-/*
* Deallocate the memory for a spinlock.
*/
void acpi_os_delete_lock(acpi_spinlock handle)
@@ -1265,21 +1255,6 @@ int acpi_check_region(resource_size_t start, resource_size_t n,
}
EXPORT_SYMBOL(acpi_check_region);
-int acpi_check_mem_region(resource_size_t start, resource_size_t n,
- const char *name)
-{
- struct resource res = {
- .start = start,
- .end = start + n - 1,
- .name = name,
- .flags = IORESOURCE_MEM,
- };
-
- return acpi_check_resource_conflict(&res);
-
-}
-EXPORT_SYMBOL(acpi_check_mem_region);
-
/*
* Let drivers know whether the resource checks are effective
*/