From 3cd17672a6995202a6cf5fcbe3bdcb92b585d312 Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Tue, 23 Oct 2012 23:49:17 +0000
Subject: Merge ACPICA 20121018.

---
 sys/contrib/dev/acpica/components/executer/exdebug.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'sys/contrib/dev/acpica/components/executer/exdebug.c')

diff --git a/sys/contrib/dev/acpica/components/executer/exdebug.c b/sys/contrib/dev/acpica/components/executer/exdebug.c
index 0188bab..600118b 100644
--- a/sys/contrib/dev/acpica/components/executer/exdebug.c
+++ b/sys/contrib/dev/acpica/components/executer/exdebug.c
@@ -162,9 +162,9 @@ AcpiExDoDebugObject (
     case ACPI_TYPE_BUFFER:
 
         AcpiOsPrintf ("[0x%.2X]\n", (UINT32) SourceDesc->Buffer.Length);
-        AcpiUtDumpBuffer2 (SourceDesc->Buffer.Pointer,
+        AcpiUtDumpBuffer (SourceDesc->Buffer.Pointer,
             (SourceDesc->Buffer.Length < 256) ?
-                SourceDesc->Buffer.Length : 256, DB_BYTE_DISPLAY);
+                SourceDesc->Buffer.Length : 256, DB_BYTE_DISPLAY, 0);
         break;
 
     case ACPI_TYPE_STRING:
@@ -205,7 +205,7 @@ AcpiExDoDebugObject (
             /* Case for DdbHandle */
 
             AcpiOsPrintf ("Table Index 0x%X\n", SourceDesc->Reference.Value);
-            return;
+            return_VOID;
 
         default:
             break;
@@ -274,5 +274,3 @@ AcpiExDoDebugObject (
     return_VOID;
 }
 #endif
-
-
-- 
cgit v1.1