summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2008-08-03 02:12:22 +0000
committerjoerg <joerg@NetBSD.org>2008-08-03 02:12:22 +0000
commit3ea923f75aea96ef31a0f57787fcb042a9665ec4 (patch)
tree2de3e0013b117dc9b1a2eabd42d27b8fbe89faea /sys/dev
parentc3d6a15f0c6177d4c8e3002ba7eee4346b3f4eee (diff)
Allow using VGA_POST without ACPI again.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/vga_pci.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index e8bd2b7bc3f..28dced676f4 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.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