summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsthen <sthen@openbsd.org>2009-10-13 00:19:38 +0000
committersthen <sthen@openbsd.org>2009-10-13 00:19:38 +0000
commit2fb72854b7346452db57569a10ec39f0176fd814 (patch)
tree5ec0742401c77a92eef79d9e720cef10bff20188
parenttrim ending whitespaces in aliases files otherwhise makemap will fail to (diff)
downloadwireguard-openbsd-2fb72854b7346452db57569a10ec39f0176fd814.tar.xz
wireguard-openbsd-2fb72854b7346452db57569a10ec39f0176fd814.zip
sort the device list. from Brad.
-rw-r--r--sys/dev/pci/ahci.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/pci/ahci.c b/sys/dev/pci/ahci.c
index 8bbda5982d1..7189c55c934 100644
--- a/sys/dev/pci/ahci.c
+++ b/sys/dev/pci/ahci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahci.c,v 1.149 2009/10/05 11:49:26 deraadt Exp $ */
+/* $OpenBSD: ahci.c,v 1.150 2009/10/13 00:19:38 sthen Exp $ */
/*
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -427,20 +427,22 @@ int ahci_nvidia_mcp_attach(struct ahci_softc *,
struct pci_attach_args *);
static const struct ahci_device ahci_devices[] = {
- { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8251_SATA,
- ahci_no_match, ahci_vt8251_attach },
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA,
NULL, ahci_ati_sb600_attach },
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SATA_1,
NULL, ahci_ati_sb600_attach },
+
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_AHCI_2,
NULL, ahci_nvidia_mcp_attach },
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_AHCI_1,
NULL, ahci_nvidia_mcp_attach },
+ { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_AHCI_9,
+ NULL, ahci_nvidia_mcp_attach },
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_5,
NULL, ahci_nvidia_mcp_attach },
- { PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_AHCI_9,
- NULL, ahci_nvidia_mcp_attach }
+
+ { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8251_SATA,
+ ahci_no_match, ahci_vt8251_attach }
};
int ahci_pci_match(struct device *, void *, void *);