summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobert <robert@openbsd.org>2006-03-28 12:56:44 +0000
committerrobert <robert@openbsd.org>2006-03-28 12:56:44 +0000
commit53d833f8c56918e197c69eb356225f38e6860b5c (patch)
treedc2603957158c3217063ad7c69424a0e8f194fc9
parentcheck rcs_head_set() return value; OK niallo@. (diff)
downloadwireguard-openbsd-53d833f8c56918e197c69eb356225f38e6860b5c.tar.xz
wireguard-openbsd-53d833f8c56918e197c69eb356225f38e6860b5c.zip
Add Intel 82801GB (ICH7M) SATA;
reported by Gabor Micsko <trey@hup.hu>; ok jsg@ marco@ kettenis@
-rw-r--r--share/man/man4/pciide.44
-rw-r--r--sys/dev/pci/pciide.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4
index 7652afcd1f2..c4f3bd21288 100644
--- a/share/man/man4/pciide.4
+++ b/share/man/man4/pciide.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pciide.4,v 1.58 2006/02/01 10:12:04 jsg Exp $
+.\" $OpenBSD: pciide.4,v 1.59 2006/03/28 12:56:44 robert Exp $
.\" $NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $
.\"
.\" Copyright (c) 1998 Manuel Bouyer.
@@ -84,7 +84,7 @@ Intel PIIX, PIIX3, and PIIX4
.It
Intel 82801
(ICH/ICH0/ICH2/ICH3/ICH4/ICH4-M/ICH5/ICH5R/\&
-ICH6/ICH6M/ICH6R/ICH7)
+ICH6/ICH6M/ICH6R/ICH7/ICH7M)
.It
Intel 6300ESB
.It
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 0aace7faf0f..90ad2b0ba4d 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.229 2006/03/27 20:33:38 kettenis Exp $ */
+/* $OpenBSD: pciide.c,v 1.230 2006/03/28 12:56:44 robert Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -437,6 +437,10 @@ const struct pciide_product_desc pciide_intel_products[] = {
{ PCI_PRODUCT_INTEL_82801GB_SATA_1, /* Intel 82801GB (ICH7) SATA */
IDE_PCI_CLASS_OVERRIDE,
piixsata_chip_map
+ },
+ { PCI_PRODUCT_INTEL_82801GBM_SATA, /* Intel 82801GB (ICH7M) SATA */
+ IDE_PCI_CLASS_OVERRIDE,
+ piixsata_chip_map
}
};