diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /drivers/acpi/utilities/utalloc.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/acpi/utilities/utalloc.c')
| -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 | ||