Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow using VGA_POST without ACPI again.

This commit is contained in:
joerg 2008-08-03 02:12:22 +00:00
parent c3d6a15f0c
commit 3ea923f75a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/pci/vga_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vga_pci.c,v 1.43 2008/07/31 14:05:05 joerg Exp $ */
/* $NetBSD: vga_pci.c,v 1.44 2008/08/03 02:12:22 joerg 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.43 2008/07/31 14:05:05 joerg Exp $");
__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.44 2008/08/03 02:12:22 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -55,6 +55,9 @@ __KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.43 2008/07/31 14:05:05 joerg Exp $");
#include "opt_vga.h"
#ifdef VGA_POST
# if defined(__i386__) || defined(__amd64__)
# include "acpi.h"
# endif
#include <x86/vga_post.h>
#endif
@ -263,14 +266,14 @@ vga_pci_rescan(struct device *self, const char *ifattr, const int *locators)
static bool
vga_pci_resume(device_t dv PMF_FN_ARGS)
{
#ifdef VGA_POST
#if defined(VGA_POST) && NACPI > 0
extern int acpi_md_vbios_reset;
#endif
struct vga_pci_softc *sc = device_private(dv);
vga_resume(&sc->sc_vga);
#ifdef VGA_POST
#if defined(VGA_POST) && NACPI > 0
if (sc->sc_posth != NULL && acpi_md_vbios_reset == 2)
vga_post_call(sc->sc_posth);
#endif