PANKOVs restructure

@@ -16,15 +16,16 @@
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright (c) 2012 Gary Mills
- *
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2012 Gary Mills
+ * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  */
 
 /*
  * ACPI enumerator
  */

@@ -31,14 +32,14 @@
 
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
 #include <sys/sunndi.h>
 #include <sys/note.h>
-#include <sys/acpi/acpi.h>
-#include <sys/acpica.h>
 #include <util/sscanf.h>
 
+#include <acpica/include/acpi.h>
+#include <sys/acpica.h>
 
 static char keyboard_alias[] = "keyboard";
 static char mouse_alias[] = "mouse";
 #define ACPI_ENUM_DEBUG         "acpi_enum_debug"
 #define PARSE_RESOURCES_DEBUG   0x0001