PANKOVs restructure

*** 16,33 ****
   * fields enclosed by brackets "[]" replaced with your own identifying
   * information: Portions Copyright [yyyy] [name of copyright owner]
   *
   * CDDL HEADER END
   */
  /*
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   * Copyright 2011 Joyent, Inc.  All rights reserved.
!  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
   */
  /*
!  * Solaris x86 ACPI CA Embedded Controller operation region handler
   */
  
  #include <sys/file.h>
  #include <sys/errno.h>
  #include <sys/conf.h>
--- 16,35 ----
   * fields enclosed by brackets "[]" replaced with your own identifying
   * information: Portions Copyright [yyyy] [name of copyright owner]
   *
   * CDDL HEADER END
   */
+ 
  /*
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   * Copyright 2011 Joyent, Inc.  All rights reserved.
!  * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
   */
+ 
  /*
!  * x86 ACPI CA Embedded Controller operation region handler
   */
  
  #include <sys/file.h>
  #include <sys/errno.h>
  #include <sys/conf.h>
*** 37,47 ****
  #include <sys/ddi.h>
  #include <sys/sunddi.h>
  #include <sys/note.h>
  #include <sys/atomic.h>
  
! #include <sys/acpi/acpi.h>
  #include <sys/acpica.h>
  
  /*
   * EC status bits
   * Low to high
--- 39,49 ----
  #include <sys/ddi.h>
  #include <sys/sunddi.h>
  #include <sys/note.h>
  #include <sys/atomic.h>
  
! #include <acpica/include/acpi.h>
  #include <sys/acpica.h>
  
  /*
   * EC status bits
   * Low to high