Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (34 commits)
  ACPI: processor: push file static MADT pointer into internal map_madt_entry()
  ACPI: processor: refactor internal map_lsapic_id()
  ACPI: processor: refactor internal map_x2apic_id()
  ACPI: processor: refactor internal map_lapic_id()
  ACPI: processor: driver doesn't need to evaluate _PDC
  ACPI: processor: remove early _PDC optin quirks
  ACPI: processor: add internal processor_physically_present()
  ACPI: processor: move acpi_get_cpuid into processor_core.c
  ACPI: processor: export acpi_get_cpuid()
  ACPI: processor: mv processor_pdc.c processor_core.c
  ACPI: processor: mv processor_core.c processor_driver.c
  ACPI: plan to delete "acpi=ht" boot option
  ACPI: remove "acpi=ht" DMI blacklist
  PNPACPI: add bus number support
  PNPACPI: add window support
  resource: add window support
  resource: add bus number support
  resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type
  acpiphp: Execute ACPI _REG method for hotadded devices
  ACPI video: Be more liberal in validating _BQC behaviour
  ...

1 files changed, 0 insertions, 45 deletions

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 11882dbe2094..c9a49f4747e6 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -289,51 +289,6 @@ acpi_evaluate_integer(acpi_handle handle,
 
 EXPORT_SYMBOL(acpi_evaluate_integer);
 
-#if 0
-acpi_status
-acpi_evaluate_string(acpi_handle handle,
-                     acpi_string pathname,
-                     acpi_object_list * arguments, acpi_string * data)
-{
-        acpi_status status = AE_OK;
-        acpi_object *element = NULL;
-        acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-
-
-        if (!data)
-                return AE_BAD_PARAMETER;
-
-        status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
-        if (ACPI_FAILURE(status)) {
-                acpi_util_eval_error(handle, pathname, status);
-                return status;
-        }
-
-        element = (acpi_object *) buffer.pointer;
-
-        if ((element->type != ACPI_TYPE_STRING)
-            || (element->type != ACPI_TYPE_BUFFER)
-            || !element->string.length) {
-                acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
-                return AE_BAD_DATA;
-        }
-
-        *data = kzalloc(element->string.length + 1, GFP_KERNEL);
-        if (!data) {
-                printk(KERN_ERR PREFIX "Memory allocation\n");
-                return -ENOMEM;
-        }
-
-        memcpy(*data, element->string.pointer, element->string.length);
-
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data));
-
-        kfree(buffer.pointer);
-
-        return AE_OK;
-}
-#endif
-
 acpi_status
 acpi_evaluate_reference(acpi_handle handle,
                         acpi_string pathname,