diff options
| author | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:47 -0400 |
| commit | c0dc250e89cb8af77c5689b36eda851158e8573e (patch) | |
| tree | 41c11fb811b31ee28bd20befdc685384f96db1fc /drivers/acpi/utilities | |
| parent | 0f12b15ebcedce115a5d8e5ff741e49a7993f67c (diff) | |
| parent | e21c1ca3f98529921c829a792dfdbfc5a5dc393b (diff) | |
Pull acpi_os_allocate into test branch
Diffstat (limited to 'drivers/acpi/utilities')
| -rw-r--r-- | drivers/acpi/utilities/utalloc.c | 2 |
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, | |||
| 285 | return (status); | 285 | return (status); |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | #ifdef NOT_USED_BY_LINUX | ||
| 288 | /******************************************************************************* | 289 | /******************************************************************************* |
| 289 | * | 290 | * |
| 290 | * FUNCTION: acpi_ut_allocate | 291 | * FUNCTION: acpi_ut_allocate |
| @@ -360,3 +361,4 @@ void *acpi_ut_allocate_zeroed(acpi_size size, | |||
| 360 | 361 | ||
| 361 | return (allocation); | 362 | return (allocation); |
| 362 | } | 363 | } |
| 364 | #endif | ||