summaryrefslogtreecommitdiff
path: root/drivers/acpi/utilities
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-07-10 10:39:47 +0400
committerLen Brown <len.brown@intel.com>2006-07-10 10:39:47 +0400
commitc0dc250e89cb8af77c5689b36eda851158e8573e (patch)
tree41c11fb811b31ee28bd20befdc685384f96db1fc /drivers/acpi/utilities
parent0f12b15ebcedce115a5d8e5ff741e49a7993f67c (diff)
parente21c1ca3f98529921c829a792dfdbfc5a5dc393b (diff)
downloadlinux-c0dc250e89cb8af77c5689b36eda851158e8573e.tar.xz
Pull acpi_os_allocate into test branch
Diffstat (limited to 'drivers/acpi/utilities')
-rw-r--r--drivers/acpi/utilities/utalloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 5cff17dc78b3..f6cbc0b1bfd0 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -285,6 +285,7 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
return (status);
}
+#ifdef NOT_USED_BY_LINUX
/*******************************************************************************
*
* FUNCTION: acpi_ut_allocate
@@ -360,3 +361,4 @@ void *acpi_ut_allocate_zeroed(acpi_size size,
return (allocation);
}
+#endif