From a3abcdbc254b0a23492bc1205dd133c3fbb703fa Mon Sep 17 00:00:00 2001 From: jmcneill Date: Tue, 18 Aug 2009 20:46:10 +0000 Subject: [PATCH] Adapt for NACPI -> NACPICA change. --- sys/dev/pci/vga_pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index a9ad9a4d36e1..c1d09941bc02 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -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 -__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 #include @@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.46 2009/05/06 10:34:33 cegger Exp $"); #ifdef VGA_POST # if defined(__i386__) || defined(__amd64__) -# include "acpi.h" +# include "acpica.h" # endif #include #endif @@ -265,14 +265,14 @@ vga_pci_rescan(device_t self, const char *ifattr, const int *locators) 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