Module Name: src
Committed By: jmcneill
Date: Tue Aug 18 20:46:10 UTC 2009
Modified Files:
src/sys/dev/pci: vga_pci.c
Log Message:
Adapt for NACPI -> NACPICA change.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/vga_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/vga_pci.c
diff -u src/sys/dev/pci/vga_pci.c:1.46 src/sys/dev/pci/vga_pci.c:1.47
--- src/sys/dev/pci/vga_pci.c:1.46 Wed May 6 10:34:33 2009
+++ src/sys/dev/pci/vga_pci.c Tue Aug 18 20:46:10 2009
@@ -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
