diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-06-25 18:55:57 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-06-25 18:58:03 +0000 |
| commit | 1b8e2ab22100cf95c6c6ec115edcb7fbd2884bcf (patch) | |
| tree | 5948ba2b7d57a00821e6ea8bd7e62c0f3040b81a /usr/src/common/pci/pci_strings.c | |
| parent | b061d3188d42c259e153cd6839fbeaacc4ccbfce (diff) | |
| parent | 13c8743e4d3cc6d9653687512c0d48d2b653513d (diff) | |
| download | illumos-joyent-1b8e2ab22100cf95c6c6ec115edcb7fbd2884bcf.tar.gz | |
[illumos-gate merge]
commit 13c8743e4d3cc6d9653687512c0d48d2b653513d
3814 Support for SATA III
Reviewed by: Johann 'Myrkraverk' Oskarsson <johann@myrkraverk.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Garrett D'Amore <garrett@damore.org>
commit 257c04ecb24858f6d68020a41589306f554ea434
3815 AHCI: Support for Marvell 88SE9128
Reviewed by: Johann 'Myrkraverk' Oskarsson <johann@myrkraverk.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Garrett D'Amore <garrett@damore.org>
commit 9384cec630155c229c70dfb8a445c6ccf433045a
3820 /usr/bin/sed doesn't handle binary files.
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Marcel Telka <marcel@telka.sk>
commit deeb0f36019670ade13450cb986b946c2e4002e6
3837 Get rid of custom getln() implementation from whois.c
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Yuri Pankov <yuri@xvoid.org>
commit 588ef7d7682af16db66cd51d457078fea0519e47
3036 Update hwdata to current upstream data
commit 0f24ff92c543e3909da566a91add6a92bcad02ed
3788 /etc/bootrc is defunct and should be removed
Conflict: usr/src/cmd/hwdata/pci.ids
Conflict: usr/src/cmd/prtconf/prtconf.c
Manifest: usr/src/pkg/manifests/driver-network-platform.mf
Diffstat (limited to 'usr/src/common/pci/pci_strings.c')
| -rw-r--r-- | usr/src/common/pci/pci_strings.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/common/pci/pci_strings.c b/usr/src/common/pci/pci_strings.c index 42501f5e05..0b04a06e7e 100644 --- a/usr/src/common/pci/pci_strings.c +++ b/usr/src/common/pci/pci_strings.c @@ -23,8 +23,9 @@ * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + */ #include <sys/types.h> #include <sys/stat.h> @@ -42,7 +43,7 @@ const pci_class_strings_t class_pci[] = { 1, 5, 0x20, "ATA controller with single DMA", "ata", 1, 5, 0x30, "ATA controller with chained DMA", "ata", 1, 6, 0, "Serial ATA Direct Port Access (DPA)", "sata", - 1, 6, 1, "SATA AHCI 1.0 Interface", "sata", + 1, 6, 1, "SATA AHCI Interface", "sata", 1, 6, 2, "Serial Storage Bus Interface", "sata", 1, 7, 0, "Serial Attached SCSI Controller", "sas", 1, 7, 1, "Serial Storage Bus Interface", "sas", |