PANKOVs restructure

          --- old/usr/src/uts/i86pc/os/acpi_stubs.c
          +++ new/usr/src/uts/i86pc/os/acpi_stubs.c

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the

  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  
  26      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  27      -
  28   26  #include <sys/types.h>
  29   27  
  30      -#include <sys/acpi/acpi.h>
       28 +#include <acpica/include/acpi.h>
  31   29  #include <sys/acpica.h>
  32   30  
  33   31  /*
  34   32   * This file contains ACPI functions that are needed by the kernel before
  35   33   * the ACPI module is loaded.  Any functions or definitions need to be
  36   34   * able to deal with the possibility that ACPI doesn't get loaded, or
  37   35   * doesn't contain the required method.
  38   36   */
  39   37  
  40   38  int (*acpi_fp_setwake)();

  41   39  
  42   40  /*
  43   41   *
  44   42   */
  45   43  int
  46   44  acpi_ddi_setwake(dev_info_t *dip, int level)
  47   45  {
  48   46          if (acpi_fp_setwake == NULL)
  49   47                  return (AE_ERROR);
  50   48  
  51   49          return ((*acpi_fp_setwake)(dip, level));
  52   50  }

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX