regen
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 14 Nov 2006 12:32:18 +0000 (12:32 +0000)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 14 Nov 2006 12:32:18 +0000 (12:32 +0000)
sys/bus/pci/pcidevs.h
sys/bus/pci/pcidevs_data.h

index b4e83ca..4175c20 100644 (file)
@@ -1,10 +1,10 @@
-/*     $DragonFly: src/sys/bus/pci/pcidevs.h,v 1.21 2006/10/17 12:38:25 sephe Exp $    */
+/*     $DragonFly: src/sys/bus/pci/pcidevs.h,v 1.22 2006/11/14 12:32:18 sephe Exp $    */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *     DragonFly: src/sys/bus/pci/pcidevs,v 1.20 2006/10/17 12:26:02 sephe Exp 
+ *     DragonFly: src/sys/bus/pci/pcidevs,v 1.21 2006/10/17 12:37:46 sephe Exp 
  */
 /* $NetBSD: pcidevs,v 1.606 2004/01/06 19:44:17 matt Exp $ */
 
  */
 /* $NetBSD: pcidevs,v 1.606 2004/01/06 19:44:17 matt Exp $ */
 
 #define        PCI_VENDOR_POWERCC      0x11a7          /* Power Computing */
 #define        PCI_VENDOR_INNOSYS      0x11a9          /* InnoSys */
 #define        PCI_VENDOR_ACTEL        0x11aa          /* Actel */
 #define        PCI_VENDOR_POWERCC      0x11a7          /* Power Computing */
 #define        PCI_VENDOR_INNOSYS      0x11a9          /* InnoSys */
 #define        PCI_VENDOR_ACTEL        0x11aa          /* Actel */
-#define        PCI_VENDOR_GALILEO      0x11ab          /* Galileo Technology */
+#define        PCI_VENDOR_MARVELL      0x11ab          /* Marvell (was Galileo Technology) */
 #define        PCI_VENDOR_CANNON       0x11ac          /* Cannon IS */
 #define        PCI_VENDOR_LITEON       0x11ad          /* Lite-On Communications */
 #define        PCI_VENDOR_SCITEX       0x11ae          /* Scitex Corporation */
 #define        PCI_VENDOR_CANNON       0x11ac          /* Cannon IS */
 #define        PCI_VENDOR_LITEON       0x11ad          /* Lite-On Communications */
 #define        PCI_VENDOR_SCITEX       0x11ae          /* Scitex Corporation */
 #define        PCI_VENDOR_FORTEMEDIA   0x1319          /* Forte Media */
 #define        PCI_VENDOR_SIIG 0x131f          /* Siig, Inc. */
 #define        PCI_VENDOR_DOMEX        0x134a          /* Domex */
 #define        PCI_VENDOR_FORTEMEDIA   0x1319          /* Forte Media */
 #define        PCI_VENDOR_SIIG 0x131f          /* Siig, Inc. */
 #define        PCI_VENDOR_DOMEX        0x134a          /* Domex */
+#define        PCI_VENDOR_CNET 0x1371          /* CNet */
 #define        PCI_VENDOR_LMC  0x1376          /* LAN Media Corporation */
 #define        PCI_VENDOR_NETGEAR      0x1385          /* Netgear */
 #define        PCI_VENDOR_LEVELONE     0x1394          /* Level One */
 #define        PCI_VENDOR_LMC  0x1376          /* LAN Media Corporation */
 #define        PCI_VENDOR_NETGEAR      0x1385          /* Netgear */
 #define        PCI_VENDOR_LEVELONE     0x1394          /* Level One */
 #define        PCI_PRODUCT_3COM_3C556B 0x6056          /* 3c556B 10/100 MiniPCI Ethernet */
 #define        PCI_PRODUCT_3COM_3CSOHO100TX    0x7646          /* 3cSOHO100-TX 10/100 Ethernet */
 #define        PCI_PRODUCT_3COM_3CRWE777A      0x7770          /* 3crwe777a AirConnect */
 #define        PCI_PRODUCT_3COM_3C556B 0x6056          /* 3c556B 10/100 MiniPCI Ethernet */
 #define        PCI_PRODUCT_3COM_3CSOHO100TX    0x7646          /* 3cSOHO100-TX 10/100 Ethernet */
 #define        PCI_PRODUCT_3COM_3CRWE777A      0x7770          /* 3crwe777a AirConnect */
+#define        PCI_PRODUCT_3COM_3C940B 0x80eb          /* 3c940B Gigabit Ethernet */
 #define        PCI_PRODUCT_3COM_3C900TPO       0x9000          /* 3c900-TPO Ethernet */
 #define        PCI_PRODUCT_3COM_3C900COMBO     0x9001          /* 3c900-COMBO Ethernet */
 #define        PCI_PRODUCT_3COM_3C905TX        0x9050          /* 3c905-TX 10/100 Ethernet */
 #define        PCI_PRODUCT_3COM_3C900TPO       0x9000          /* 3c900-TPO Ethernet */
 #define        PCI_PRODUCT_3COM_3C900COMBO     0x9001          /* 3c900-COMBO Ethernet */
 #define        PCI_PRODUCT_3COM_3C905TX        0x9050          /* 3c905-TX 10/100 Ethernet */
 #define        PCI_PRODUCT_CMEDIA_CMI8738B     0x0112          /* CMI8738B PCI Audio Device */
 #define        PCI_PRODUCT_CMEDIA_HSP56        0x0211          /* HSP56 Audiomodem Riser */
 
 #define        PCI_PRODUCT_CMEDIA_CMI8738B     0x0112          /* CMI8738B PCI Audio Device */
 #define        PCI_PRODUCT_CMEDIA_HSP56        0x0211          /* HSP56 Audiomodem Riser */
 
+/* CNet produts */
+#define        PCI_PRODUCT_CNET_GIGACARD       0x434e          /* GigaCard */
+
 /* Cogent Data Technologies products */
 #define        PCI_PRODUCT_COGENT_EM110TX      0x1400          /* EX110TX PCI Fast Ethernet Adapter */
 
 /* Cogent Data Technologies products */
 #define        PCI_PRODUCT_COGENT_EM110TX      0x1400          /* EX110TX PCI Fast Ethernet Adapter */
 
 #define        PCI_PRODUCT_DLINK_DFE690TXD     0x1340          /* DFE-690TXD 10/100 Ethernet */
 #define        PCI_PRODUCT_DLINK_DL4000        0x4000          /* DL-4000 Gigabit Ethernet */
 #define        PCI_PRODUCT_DLINK_DGE528T       0x4300          /* DGE-528T Gigabit Ethernet */
 #define        PCI_PRODUCT_DLINK_DFE690TXD     0x1340          /* DFE-690TXD 10/100 Ethernet */
 #define        PCI_PRODUCT_DLINK_DL4000        0x4000          /* DL-4000 Gigabit Ethernet */
 #define        PCI_PRODUCT_DLINK_DGE528T       0x4300          /* DGE-528T Gigabit Ethernet */
-#define        PCI_PRODUCT_DLINK_DGE530T       0x4c00          /* DGE-530T Gigabit Ethernet */
+#define        PCI_PRODUCT_DLINK_DGE560T       0x4b00          /* DGE-560T */
+#define        PCI_PRODUCT_DLINK_DGE530T_B1    0x4b01          /* DGE-530T B1 */
+#define        PCI_PRODUCT_DLINK_DGE530T_A1    0x4c00          /* DGE-530T A1 */
 
 /* Distributed Processing Technology products */
 #define        PCI_PRODUCT_DPT_SC_RAID 0xa400          /* SmartCache/SmartRAID (EATA) */
 
 /* Distributed Processing Technology products */
 #define        PCI_PRODUCT_DPT_SC_RAID 0xa400          /* SmartCache/SmartRAID (EATA) */
 #define        PCI_PRODUCT_EFFICIENTNETS_ENI25P        0x0003          /* SpeedStream ENI-25p */
 #define        PCI_PRODUCT_EFFICIENTNETS_SS3000        0x0005          /* SpeedStream 3000 */
 
 #define        PCI_PRODUCT_EFFICIENTNETS_ENI25P        0x0003          /* SpeedStream ENI-25p */
 #define        PCI_PRODUCT_EFFICIENTNETS_SS3000        0x0005          /* SpeedStream 3000 */
 
-/* Galileo Technology products */
-#define        PCI_PRODUCT_GALILEO_GT64010A    0x0146          /* GT-64010A System Controller */
-#define        PCI_PRODUCT_GALILEO_GT64115     0x4111          /* GT-64115 System Controller */
-#define        PCI_PRODUCT_GALILEO_GT64011     0x4146          /* GT-64011 System Controller */
-#define        PCI_PRODUCT_GALILEO_GT64120     0x4620          /* GT-64120 System Controller */
-#define        PCI_PRODUCT_GALILEO_GT64130     0x6320          /* GT-64130 System Controller */
-#define        PCI_PRODUCT_GALILEO_GT64260     0x6430          /* GT-64260 System Controller */
+/* Marvell (was Galileo Technology) products */
+#define        PCI_PRODUCT_MARVELL_GT64010A    0x0146          /* GT-64010A System Controller */
+#define        PCI_PRODUCT_MARVELL_GT64115     0x4111          /* GT-64115 System Controller */
+#define        PCI_PRODUCT_MARVELL_GT64011     0x4146          /* GT-64011 System Controller */
+#define        PCI_PRODUCT_MARVELL_YUKON       0x4320          /* Yukon 88E8001/8003/8010 */
+#define        PCI_PRODUCT_MARVELL_YUKONII_8021CU      0x4340          /* Yukon-II 88E8021CU */
+#define        PCI_PRODUCT_MARVELL_YUKONII_8022CU      0x4341          /* Yukon-II 88E8022CU */
+#define        PCI_PRODUCT_MARVELL_YUKONII_8061CU      0x4342          /* Yukon-II 88E8061CU */
+#define        PCI_PRODUCT_MARVELL_YUKONII_8062CU      0x4343          /* Yukon-II 88E8062CU */
+#define        PCI_PRODUCT_MARVELL_YUKONII_8021X       0x4344          /* Yukon-II 88E8021X */
+#define        PCI_PRODUCT_MARVELL_YUKONII_8022X       0x4345          /* Yukon-II 88E8022X */
+#define        PCI_PRODUCT_MARVELL_YUKONII_8061X       0x4346          /* Yukon-II 88E8061X */
+#define        PCI_PRODUCT_MARVELL_YUKONII_8062X       0x4347          /* Yukon-II 88E8062X */
+#define        PCI_PRODUCT_MARVELL_YUKON_8035  0x4350          /* Yukon 88E8035 */
+#define        PCI_PRODUCT_MARVELL_YUKON_8036  0x4351          /* Yukon 88E8036 */
+#define        PCI_PRODUCT_MARVELL_YUKON_8038  0x4352          /* Yukon 88E8038 */
+#define        PCI_PRODUCT_MARVELL_YUKON_8052  0x4360          /* Yukon 88E8052 */
+#define        PCI_PRODUCT_MARVELL_YUKON_8050  0x4361          /* Yukon 88E8050 */
+#define        PCI_PRODUCT_MARVELL_YUKON_8053  0x4362          /* Yukon 88E8053 */
+#define        PCI_PRODUCT_MARVELL_YUKON_3     0x4363          /* Yukon */
+#define        PCI_PRODUCT_MARVELL_GT64120     0x4620          /* GT-64120 System Controller */
+#define        PCI_PRODUCT_MARVELL_YUKON_BELKIN        0x5005          /* Yukon (Belkin F5D5005) */
+#define        PCI_PRODUCT_MARVELL_GT64130     0x6320          /* GT-64130 System Controller */
+#define        PCI_PRODUCT_MARVELL_GT64260     0x6430          /* GT-64260 System Controller */
 
 /* Global Sun Tech products */
 #define        PCI_PRODUCT_GLOBALSUN_GL24110P  0x1101          /* GL24110P PCI IEEE 802.11b */
 
 /* Global Sun Tech products */
 #define        PCI_PRODUCT_GLOBALSUN_GL24110P  0x1101          /* GL24110P PCI IEEE 802.11b */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SKNET_GE      0x4300          /* SK-NET GE */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2      0x4320          /* SK-9821 v2.0 */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SK_9DX1       0x4400          /* SK-NET SK-9DX1 Gigabit Ethernet */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SKNET_GE      0x4300          /* SK-NET GE */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2      0x4320          /* SK-9821 v2.0 */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SK_9DX1       0x4400          /* SK-NET SK-9DX1 Gigabit Ethernet */
+#define        PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx        0x9000          /* SK-9Sxx */
+#define        PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx        0x9e00          /* SK-9Exx */
 /* These next two are are really subsystem IDs */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SK_9D21       0x4421          /* SK-9D21 1000BASE-T */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SK_9D41       0x4441          /* SK-9D41 1000BASE-X */
 /* These next two are are really subsystem IDs */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SK_9D21       0x4421          /* SK-9D21 1000BASE-T */
 #define        PCI_PRODUCT_SCHNEIDERKOCH_SK_9D41       0x4441          /* SK-9D41 1000BASE-X */
index d6855cf..c9790f5 100644 (file)
@@ -1,10 +1,10 @@
-/*     $DragonFly: src/sys/bus/pci/pcidevs_data.h,v 1.21 2006/10/17 12:38:25 sephe Exp $       */
+/*     $DragonFly: src/sys/bus/pci/pcidevs_data.h,v 1.22 2006/11/14 12:32:18 sephe Exp $       */
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *     DragonFly: src/sys/bus/pci/pcidevs,v 1.20 2006/10/17 12:26:02 sephe Exp 
+ *     DragonFly: src/sys/bus/pci/pcidevs,v 1.21 2006/10/17 12:37:46 sephe Exp 
  */
 /* $NetBSD: pcidevs,v 1.606 2004/01/06 19:44:17 matt Exp $ */
 
  */
 /* $NetBSD: pcidevs,v 1.606 2004/01/06 19:44:17 matt Exp $ */
 
@@ -136,6 +136,12 @@ const struct pci_knowndev pci_knowndevs[] = {
            "3Com",
            "3crwe777a AirConnect",
        },
            "3Com",
            "3crwe777a AirConnect",
        },
+       {
+           PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C940B,
+           0,
+           "3Com",
+           "3c940B Gigabit Ethernet",
+       },
        {
            PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900TPO,
            0,
        {
            PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900TPO,
            0,
@@ -2860,6 +2866,12 @@ const struct pci_knowndev pci_knowndevs[] = {
            "C-Media Electronics, Inc.",
            "HSP56 Audiomodem Riser",
        },
            "C-Media Electronics, Inc.",
            "HSP56 Audiomodem Riser",
        },
+       {
+           PCI_VENDOR_CNET, PCI_PRODUCT_CNET_GIGACARD,
+           0,
+           "CNet",
+           "GigaCard",
+       },
        {
            PCI_VENDOR_COGENT, PCI_PRODUCT_COGENT_EM110TX,
            0,
        {
            PCI_VENDOR_COGENT, PCI_PRODUCT_COGENT_EM110TX,
            0,
@@ -3527,10 +3539,22 @@ const struct pci_knowndev pci_knowndevs[] = {
            "DGE-528T Gigabit Ethernet",
        },
        {
            "DGE-528T Gigabit Ethernet",
        },
        {
-           PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE530T,
+           PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560T,
+           0,
+           "D-Link Systems",
+           "DGE-560T",
+       },
+       {
+           PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE530T_B1,
+           0,
+           "D-Link Systems",
+           "DGE-530T B1",
+       },
+       {
+           PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE530T_A1,
            0,
            "D-Link Systems",
            0,
            "D-Link Systems",
-           "DGE-530T Gigabit Ethernet",
+           "DGE-530T A1",
        },
        {
            PCI_VENDOR_DPT, PCI_PRODUCT_DPT_SC_RAID,
        },
        {
            PCI_VENDOR_DPT, PCI_PRODUCT_DPT_SC_RAID,
@@ -3905,39 +3929,141 @@ const struct pci_knowndev pci_knowndevs[] = {
            "SpeedStream 3000",
        },
        {
            "SpeedStream 3000",
        },
        {
-           PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_GT64010A,
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_GT64010A,
            0,
            0,
-           "Galileo Technology",
+           "Marvell (was Galileo Technology)",
            "GT-64010A System Controller",
        },
        {
            "GT-64010A System Controller",
        },
        {
-           PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_GT64115,
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_GT64115,
            0,
            0,
-           "Galileo Technology",
+           "Marvell (was Galileo Technology)",
            "GT-64115 System Controller",
        },
        {
            "GT-64115 System Controller",
        },
        {
-           PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_GT64011,
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_GT64011,
            0,
            0,
-           "Galileo Technology",
+           "Marvell (was Galileo Technology)",
            "GT-64011 System Controller",
        },
        {
            "GT-64011 System Controller",
        },
        {
-           PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_GT64120,
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon 88E8001/8003/8010",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021CU,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon-II 88E8021CU",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022CU,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon-II 88E8022CU",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061CU,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon-II 88E8061CU",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062CU,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon-II 88E8062CU",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021X,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon-II 88E8021X",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022X,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon-II 88E8022X",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061X,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon-II 88E8061X",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062X,
            0,
            0,
-           "Galileo Technology",
+           "Marvell (was Galileo Technology)",
+           "Yukon-II 88E8062X",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8035,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon 88E8035",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8036,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon 88E8036",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8038,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon 88E8038",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8052,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon 88E8052",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8050,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon 88E8050",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8053,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon 88E8053",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_3,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_GT64120,
+           0,
+           "Marvell (was Galileo Technology)",
            "GT-64120 System Controller",
        },
        {
            "GT-64120 System Controller",
        },
        {
-           PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_GT64130,
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_BELKIN,
+           0,
+           "Marvell (was Galileo Technology)",
+           "Yukon (Belkin F5D5005)",
+       },
+       {
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_GT64130,
            0,
            0,
-           "Galileo Technology",
+           "Marvell (was Galileo Technology)",
            "GT-64130 System Controller",
        },
        {
            "GT-64130 System Controller",
        },
        {
-           PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_GT64260,
+           PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_GT64260,
            0,
            0,
-           "Galileo Technology",
+           "Marvell (was Galileo Technology)",
            "GT-64260 System Controller",
        },
        {
            "GT-64260 System Controller",
        },
        {
@@ -9526,6 +9652,18 @@ const struct pci_knowndev pci_knowndevs[] = {
            "Schneider & Koch",
            "SK-NET SK-9DX1 Gigabit Ethernet",
        },
            "Schneider & Koch",
            "SK-NET SK-9DX1 Gigabit Ethernet",
        },
+       {
+           PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx,
+           0,
+           "Schneider & Koch",
+           "SK-9Sxx",
+       },
+       {
+           PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx,
+           0,
+           "Schneider & Koch",
+           "SK-9Exx",
+       },
        {
            PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK_9D21,
            0,
        {
            PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK_9D21,
            0,
@@ -13763,9 +13901,9 @@ const struct pci_knowndev pci_knowndevs[] = {
            NULL,
        },
        {
            NULL,
        },
        {
-           PCI_VENDOR_GALILEO, 0,
+           PCI_VENDOR_MARVELL, 0,
            PCI_KNOWNDEV_NOPROD,
            PCI_KNOWNDEV_NOPROD,
-           "Galileo Technology",
+           "Marvell (was Galileo Technology)",
            NULL,
        },
        {
            NULL,
        },
        {
@@ -14236,6 +14374,12 @@ const struct pci_knowndev pci_knowndevs[] = {
            "Domex",
            NULL,
        },
            "Domex",
            NULL,
        },
+       {
+           PCI_VENDOR_CNET, 0,
+           PCI_KNOWNDEV_NOPROD,
+           "CNet",
+           NULL,
+       },
        {
            PCI_VENDOR_LMC, 0,
            PCI_KNOWNDEV_NOPROD,
        {
            PCI_VENDOR_LMC, 0,
            PCI_KNOWNDEV_NOPROD,