Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x86/pci/pci_machdep.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x86/pci/pci_machdep.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.14.2.2
diff -u -p -r1.14 -r1.14.2.2
--- src/sys/arch/x86/pci/pci_machdep.c	2006/02/07 20:38:43	1.14
+++ src/sys/arch/x86/pci/pci_machdep.c	2006/08/11 15:43:16	1.14.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.14 2006/02/07 20:38:43 bouyer Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.14.2.2 2006/08/11 15:43:16 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.14 2006/02/07 20:38:43 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.14.2.2 2006/08/11 15:43:16 yamt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -103,17 +103,20 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 
+#include "acpi.h"
 #include "opt_mpbios.h"
-#include "opt_mpacpi.h"
+#include "opt_acpi.h"
 
 #ifdef MPBIOS
 #include <machine/mpbiosvar.h>
 #endif
 
-#ifdef MPACPI
+#if NACPI > 0
 #include <machine/mpacpi.h>
 #endif
 
+#include <machine/mpconfig.h>
+
 #include "opt_pci_conf_mode.h"
 
 int pci_mode = -1;
@@ -162,6 +165,9 @@ struct {
 	_qe(0, 0, 0, PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437FX),
 	/* Connectix Virtual PC 5 has a 440BX */
 	_qe(0, 0, 0, PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82443BX_NOAGP),
+	/* Parallels Desktop for Mac */
+	_qe(0, 2, 0, PCI_VENDOR_PARALLELS, PCI_PRODUCT_PARALLELS_VIDEO),
+	_qe(0, 3, 0, PCI_VENDOR_PARALLELS, PCI_PRODUCT_PARALLELS_TOOLS),
 	/* SIS 741 */
 	_qe(0, 0, 0, PCI_VENDOR_SIS, PCI_PRODUCT_SIS_741),
 	{0, 0xffffffff} /* patchable */
@@ -237,7 +243,7 @@ pci_attach_hook(parent, self, pba)
 #ifdef MPBIOS
 	mpbios_pci_attach_hook(parent, self, pba);
 #endif
-#ifdef MPACPI
+#if NACPI > 0
 	mpacpi_pci_attach_hook(parent, self, pba);
 #endif
 }