PANKOVs restructure

@@ -16,21 +16,24 @@
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011, Joyent, Inc. All rights reserved.
- * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  */
+
 /*
  * Copyright (c) 2009, Intel Corporation.
  * All rights reserved.
  */
+
 /*
- * Solaris x86 ACPI CA services
+ * x86 ACPI CA services
  */
 
 #include <sys/file.h>
 #include <sys/errno.h>
 #include <sys/conf.h>

@@ -42,11 +45,11 @@
 #include <sys/sunddi.h>
 #include <sys/esunddi.h>
 #include <sys/kstat.h>
 #include <sys/x86_archext.h>
 
-#include <sys/acpi/acpi.h>
+#include <acpica/include/acpi.h>
 #include <sys/acpica.h>
 #include <sys/archsystm.h>
 
 /*
  *

@@ -400,12 +403,14 @@
 
         /*
          * modify default ACPI CA debug output level for non-DEBUG builds
          * (to avoid BIOS debug chatter in /var/adm/messages)
          */
-        if (acpica_muzzle_debug_output)
+        if (acpica_muzzle_debug_output) {
+                AcpiDbgLayer = 0;
                 AcpiDbgLevel = 0;
+        }
 }
 
 /*
  * Initialize the CA subsystem if it hasn't been done already
  */