Author: gavin
Date: Thu Sep 20 08:30:17 2012
New Revision: 240739
URL: http://svn.freebsd.org/changeset/base/240739

Log:
  The correct generic term for PCIS_STORAGE_NVM is "NVM" not "NVM Express".
  
  Submitted by: jimharris
  MFC after:    6 days

Modified:
  head/sys/dev/pci/pci.c
  head/usr.sbin/pciconf/pciconf.c

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c      Thu Sep 20 07:07:35 2012        (r240738)
+++ head/sys/dev/pci/pci.c      Thu Sep 20 08:30:17 2012        (r240739)
@@ -3661,7 +3661,7 @@ static struct
        {PCIC_STORAGE,          PCIS_STORAGE_ATA_ADMA,  "ATA (ADMA)"},
        {PCIC_STORAGE,          PCIS_STORAGE_SATA,      "SATA"},
        {PCIC_STORAGE,          PCIS_STORAGE_SAS,       "SAS"},
-       {PCIC_STORAGE,          PCIS_STORAGE_NVM,       "NVM Express"},
+       {PCIC_STORAGE,          PCIS_STORAGE_NVM,       "NVM"},
        {PCIC_NETWORK,          -1,                     "network"},
        {PCIC_NETWORK,          PCIS_NETWORK_ETHERNET,  "ethernet"},
        {PCIC_NETWORK,          PCIS_NETWORK_TOKENRING, "token ring"},

Modified: head/usr.sbin/pciconf/pciconf.c
==============================================================================
--- head/usr.sbin/pciconf/pciconf.c     Thu Sep 20 07:07:35 2012        
(r240738)
+++ head/usr.sbin/pciconf/pciconf.c     Thu Sep 20 08:30:17 2012        
(r240739)
@@ -345,7 +345,7 @@ static struct
        {PCIC_STORAGE,          PCIS_STORAGE_ATA_ADMA,  "ATA (ADMA)"},
        {PCIC_STORAGE,          PCIS_STORAGE_SATA,      "SATA"},
        {PCIC_STORAGE,          PCIS_STORAGE_SAS,       "SAS"},
-       {PCIC_STORAGE,          PCIS_STORAGE_NVM,       "NVM Express"},
+       {PCIC_STORAGE,          PCIS_STORAGE_NVM,       "NVM"},
        {PCIC_NETWORK,          -1,                     "network"},
        {PCIC_NETWORK,          PCIS_NETWORK_ETHERNET,  "ethernet"},
        {PCIC_NETWORK,          PCIS_NETWORK_TOKENRING, "token ring"},
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to