[src/trunk]: src/sys/dev/pci Adapt for NACPI -> NACPICA change.

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab0d5104f426
branches:  trunk
changeset: 746724:ab0d5104f426
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Aug 18 20:46:10 2009 +0000

description:
Adapt for NACPI -> NACPICA change.

diffstat:

 sys/dev/pci/vga_pci.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r c112ff2e1e3b -r ab0d5104f426 sys/dev/pci/vga_pci.c
--- a/sys/dev/pci/vga_pci.c     Tue Aug 18 20:45:42 2009 +0000
+++ b/sys/dev/pci/vga_pci.c     Tue Aug 18 20:46:10 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vga_pci.c,v 1.46 2009/05/06 10:34:33 cegger Exp $      */
+/*     $NetBSD: vga_pci.c,v 1.47 2009/08/18 20:46:10 jmcneill Exp $    */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.46 2009/05/06 10:34:33 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.47 2009/08/18 20:46:10 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -56,7 +56,7 @@
 
 #ifdef VGA_POST
 #  if defined(__i386__) || defined(__amd64__)
-#    include "acpi.h"
+#    include "acpica.h"
 #  endif
 #include <x86/vga_post.h>
 #endif
@@ -265,14 +265,14 @@
 static bool
 vga_pci_resume(device_t dv PMF_FN_ARGS)
 {
-#if defined(VGA_POST) && NACPI > 0
+#if defined(VGA_POST) && NACPICA > 0
        extern int acpi_md_vbios_reset;
 #endif
        struct vga_pci_softc *sc = device_private(dv);
 
        vga_resume(&sc->sc_vga);
 
-#if defined(VGA_POST) && NACPI > 0
+#if defined(VGA_POST) && NACPICA > 0
        if (sc->sc_posth != NULL && acpi_md_vbios_reset == 2)
                vga_post_call(sc->sc_posth);
 #endif