PANKOVs restructure

*** 16,35 ****
   * 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.
   */
  
  #include <sys/kobj.h>
  #include <sys/kobj_lex.h>
  #include <sys/ddi.h>
  #include <sys/sunddi.h>
  #include <sys/sunndi.h>
! #include <sys/acpi/acpi.h>
  #include <sys/acpica.h>
  
  #define masterfile "/boot/solaris/devicedb/master"
  
  /*
--- 16,38 ----
   * 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 2013 Nexenta Systems, Inc.  All rights reserved.
   */
  
  #include <sys/kobj.h>
  #include <sys/kobj_lex.h>
  #include <sys/ddi.h>
  #include <sys/sunddi.h>
  #include <sys/sunndi.h>
! 
! #include <acpica/include/acpi.h>
  #include <sys/acpica.h>
  
  #define masterfile "/boot/solaris/devicedb/master"
  
  /*