summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2010-04-16 22:15:40 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2010-04-16 22:15:40 +0000
commit4a2b738d0f45a13c600ba19f4b32302d62e56213 (patch)
treebe7b97fbcf7e125d2d3fada87a2097495c22a1b0 /sys
parent7a575dbb0482b50749d357fd72b9840589950fa3 (diff)
Remove Intel RAID IDs for now. They can be added back when code has been
written to detect the Intel RAID metadata format such that we no longer risk overwriting it. If this makes you lose your disks, you'll need to change the controller type from RAID to AHCI in the BIOS to get them back. ok marco@, deraadt@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/ahci.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/pci/ahci.c b/sys/dev/pci/ahci.c
index 1a5bcba9b8d..adf6114189a 100644
--- a/sys/dev/pci/ahci.c
+++ b/sys/dev/pci/ahci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahci.c,v 1.162 2010/04/08 00:23:53 tedu Exp $ */
+/* $OpenBSD: ahci.c,v 1.163 2010/04/16 22:15:39 kettenis Exp $ */
/*
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -440,15 +440,6 @@ static const struct ahci_device ahci_devices[] = {
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_1,
NULL, ahci_ati_sb600_attach },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801GR_RAID,
- NULL, NULL },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_RAID,
- NULL, NULL },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801HBM_RAID,
- NULL, NULL },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801JI_RAID,
- NULL, NULL },
-
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_AHCI_2,
NULL, ahci_nvidia_mcp_attach },
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_AHCI_1,