summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorsalo <salo@NetBSD.org>2003-02-26 11:51:05 +0000
committersalo <salo@NetBSD.org>2003-02-26 11:51:05 +0000
commit1014d5a4e4dee83693674581843dc9ee32383daa (patch)
treeaac3e9e4a40c8a7c99ef34a97cbe79a4afa26d1e /sys/dev
parentfc8db570ec93d3bc70e05f3dc1edbec02feb5dcb (diff)
Regen.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pcidevs.h45
-rw-r--r--sys/dev/pci/pcidevs_data.h126
-rw-r--r--sys/dev/pci/vga_pci.c6
3 files changed, 106 insertions, 71 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 9e1ef07ab2b..f2cfeef4654 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.509 2003/02/18 00:10:31 grant Exp $ */
+/* $NetBSD: pcidevs.h,v 1.510 2003/02/26 11:51:05 salo Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.506 2003/02/18 00:09:43 grant Exp
+ * NetBSD: pcidevs,v 1.507 2003/02/26 11:48:58 salo Exp
*/
/*
@@ -192,7 +192,7 @@
#define PCI_VENDOR_BIT3 0x108a /* Bit3 Computer Corp. */
#define PCI_VENDOR_ELONEX 0x108c /* Elonex PLC c/o Oakleigh Systems */
#define PCI_VENDOR_OLICOM 0x108d /* Olicom */
-#define PCI_VENDOR_SUN 0x108e /* Sun Microsystems */
+#define PCI_VENDOR_SUN 0x108e /* Sun Microsystems, Inc. */
#define PCI_VENDOR_SYSTEMSOFT 0x108f /* Systemsoft */
#define PCI_VENDOR_ENCORE 0x1090 /* Encore Computer */
#define PCI_VENDOR_INTERGRAPH 0x1091 /* Intergraph */
@@ -400,7 +400,7 @@
#define PCI_VENDOR_MEGASOFT 0x1160 /* Megasoft */
#define PCI_VENDOR_PFU 0x1161 /* PFU Limited */
#define PCI_VENDOR_OALAB 0x1162 /* OA Laboratory */
-#define PCI_VENDOR_RENDITION 0x1163 /* Rendition Inc. */
+#define PCI_VENDOR_RENDITION 0x1163 /* Rendition, Inc. */
#define PCI_VENDOR_APT 0x1164 /* Advanced Peripherals Technologies */
#define PCI_VENDOR_IMAGRAPH 0x1165 /* Imagraph */
#define PCI_VENDOR_SERVERWORKS 0x1166 /* ServerWorks */
@@ -498,7 +498,7 @@
#define PCI_VENDOR_PMCSIERRA 0x11f8 /* PMC-Sierra */
#define PCI_VENDOR_CYCLADES 0x120e /* Cyclades */
#define PCI_VENDOR_ESSENTIAL 0x120f /* Essential Communications */
-#define PCI_VENDOR_O2MICRO 0x1217 /* O2 Micro Inc */
+#define PCI_VENDOR_O2MICRO 0x1217 /* O2 Micro, Inc. */
#define PCI_VENDOR_3DFX 0x121a /* 3Dfx Interactive */
#define PCI_VENDOR_ARIEL 0x1220 /* Ariel */
#define PCI_VENDOR_HEURICON 0x1223 /* Heurikon/Computer Products */
@@ -511,15 +511,15 @@
#define PCI_VENDOR_LINEARSYS 0x1254 /* Linear Systems */
#define PCI_VENDOR_ASIX 0x125b /* ASIX Electronics */
#define PCI_VENDOR_AURORA 0x125c /* Aurora Technologies */
-#define PCI_VENDOR_ESSTECH 0x125d /* ESS Technology Inc */
+#define PCI_VENDOR_ESSTECH 0x125d /* ESS Technology, Inc. */
#define PCI_VENDOR_INTERSIL 0x1260 /* Intersil */
-#define PCI_VENDOR_SILMOTION 0x126f /* Silicon Motion */
+#define PCI_VENDOR_SILMOTION 0x126f /* Silicon Motion, Inc. */
#define PCI_VENDOR_ENSONIQ 0x1274 /* Ensoniq */
#define PCI_VENDOR_NETAPP 0x1275 /* Network Appliance */
#define PCI_VENDOR_TRANSMETA 0x1279 /* Transmeta Corp */
#define PCI_VENDOR_ROCKWELL 0x127a /* Rockwell Semiconductor Systems */
#define PCI_VENDOR_DAVICOM 0x1282 /* Davicom Semiconductor */
-#define PCI_VENDOR_ESSTECH2 0x1285 /* ESS Technology Inc */
+#define PCI_VENDOR_ESSTECH2 0x1285 /* ESS Technology, Inc. */
#define PCI_VENDOR_TRITECH 0x1292 /* TriTech Microelectronics */
#define PCI_VENDOR_KOFAX 0x1296 /* Kofax Image Products */
#define PCI_VENDOR_ALTEON 0x12ae /* Alteon */
@@ -531,7 +531,7 @@
#define PCI_VENDOR_AUREAL 0x12eb /* Aureal Semiconductor */
#define PCI_VENDOR_ADMTEK 0x1317 /* ADMtek */
#define PCI_VENDOR_FORTEMEDIA 0x1319 /* Forte Media */
-#define PCI_VENDOR_SIIG 0x131f /* Siig Inc. */
+#define PCI_VENDOR_SIIG 0x131f /* Siig, Inc. */
#define PCI_VENDOR_DOMEX 0x134a /* Domex */
#define PCI_VENDOR_LMC 0x1376 /* LAN Media Corporation */
#define PCI_VENDOR_NETGEAR 0x1385 /* Netgear */
@@ -540,7 +540,7 @@
#define PCI_VENDOR_HIFN 0x13a3 /* Hi/Fn */
#define PCI_VENDOR_3WARE 0x13c1 /* 3ware */
#define PCI_VENDOR_SUNDANCETI 0x13f0 /* Sundance Technology */
-#define PCI_VENDOR_CMEDIA 0x13f6 /* C-Media Electronics Inc */
+#define PCI_VENDOR_CMEDIA 0x13f6 /* C-Media Electronics, Inc. */
#define PCI_VENDOR_LAVA 0x1407 /* Lava Semiconductor Manufacturing, Inc. */
#define PCI_VENDOR_ETIMEDIA 0x1409 /* eTIMedia Technology Co. Ltd. */
#define PCI_VENDOR_OXFORDSEMI 0x1415 /* Oxford Semiconductor Ltd. */
@@ -582,7 +582,7 @@
#define PCI_VENDOR_INDCOMPSRC 0x494f /* Industrial Computer Source */
#define PCI_VENDOR_NETVIN 0x4a14 /* NetVin */
#define PCI_VENDOR_BUSLOGIC2 0x4b10 /* Buslogic (2nd PCI Vendor ID) */
-#define PCI_VENDOR_MEDIAQ 0x4d51 /* MediaQ Inc. */
+#define PCI_VENDOR_MEDIAQ 0x4d51 /* MediaQ, Inc. */
#define PCI_VENDOR_GUILLEMOT 0x5046 /* Guillemot */
#define PCI_VENDOR_S3 0x5333 /* S3 */
#define PCI_VENDOR_NETPOWER2 0x5700 /* NetPower (2nd PCI Vendor ID) */
@@ -1219,7 +1219,7 @@
/* Emulex products */
#define PCI_PRODUCT_EMULEX_LPPFC 0x10df /* \"Light Pulse\" FibreChannel adapter */
-/* ENE Technology Inc. products */
+/* ENE Technology, Inc. products */
#define PCI_PRODUCT_ENE_CB1410 0x1410 /* CB1410 Cardbus Controller */
/* Ensoniq products */
@@ -1231,7 +1231,7 @@
#define PCI_PRODUCT_ESSENTIAL_RR_HIPPI 0x0001 /* RoadRunner HIPPI Interface */
#define PCI_PRODUCT_ESSENTIAL_RR_GIGE 0x0005 /* RoadRunner Gig-E Interface */
-/* ESS Technology Inc products */
+/* ESS Technology, Inc. products */
#define PCI_PRODUCT_ESSTECH_MAESTRO1 0x0100 /* Maestro 1 PCI Audio Accelerator */
#define PCI_PRODUCT_ESSTECH_MAESTRO2 0x1968 /* Maestro 2 PCI Audio Accelerator */
#define PCI_PRODUCT_ESSTECH_SOLO1 0x1969 /* Solo-1 PCI AudioDrive */
@@ -1241,13 +1241,13 @@
#define PCI_PRODUCT_ESSTECH_MAESTRO3MODEM 0x1999 /* Maestro 3 Modem */
#define PCI_PRODUCT_ESSTECH_MAESTRO3_2 0x199a /* Maestro 3 PCI Audio Accelerator */
-/* ESS Technology Inc products */
+/* ESS Technology, Inc. products */
#define PCI_PRODUCT_ESSTECH2_MAESTRO1 0x0100 /* Maestro 1 PCI Audio Accelerator */
/* Eumitcom products */
#define PCI_PRODUCT_EUMITCOM_WL11000P 0x1100 /* WL11000P PCI WaveLAN/IEEE 802.11 */
-/* O2 Micro Inc */
+/* O2 Micro, Inc. */
#define PCI_PRODUCT_O2MICRO_OZ6729 0x6729 /* OZ6729 PCI-PCMCIA Bridge */
#define PCI_PRODUCT_O2MICRO_OZ6730 0x673A /* OZ6730 PCI-PCMCIA Bridge */
#define PCI_PRODUCT_O2MICRO_OZ6832 0x6832 /* OZ6832/OZ6833 PCI-CardBus Bridge */
@@ -1650,7 +1650,7 @@
#define PCI_PRODUCT_MATROX_G100_PCI 0x1000 /* MGA G100 PCI */
#define PCI_PRODUCT_MATROX_G100_AGP 0x1001 /* MGA G100 AGP */
-/* MediaQ Inc. products */
+/* MediaQ, Inc. products */
#define PCI_PRODUCT_MEDIAQ_MQ200 0x0200 /* MQ200 */
/* Middle Digital, Inc. products */
@@ -2012,9 +2012,14 @@
#define PCI_PRODUCT_SIS_7016 0x7016 /* SiS 7016 10/100 Ethernet */
#define PCI_PRODUCT_SIS_7018 0x7018 /* SiS 7018 Sound */
-/* Silicon Motion products */
-#define PCI_PRODUCT_SILMOTION_LYNX_EMP 0x0712 /* Lynx EM+ */
-#define PCI_PRODUCT_SILMOTION_LYNX_E 0x0810 /* Lynx E */
+/* Silicon Motion, Inc. products */
+#define PCI_PRODUCT_SILMOTION_SM710 0x0710 /* Lynx EM */
+#define PCI_PRODUCT_SILMOTION_SM712 0x0712 /* Lynx EM+ */
+#define PCI_PRODUCT_SILMOTION_SM720 0x0720 /* Lynx 3DM */
+#define PCI_PRODUCT_SILMOTION_SM810 0x0810 /* Lynx E */
+#define PCI_PRODUCT_SILMOTION_SM811 0x0811 /* Lynx E */
+#define PCI_PRODUCT_SILMOTION_SM820 0x0820 /* Lynx 3D */
+#define PCI_PRODUCT_SILMOTION_SM910 0x0910 /* Lynx */
/* SMC products */
#define PCI_PRODUCT_SMC_37C665 0x1000 /* FDC 37C665 */
@@ -2032,7 +2037,7 @@
#define PCI_PRODUCT_SONY_CXD3222 0x8039 /* CXD3222 OHCI IEEE 1394 Host Controller */
#define PCI_PRODUCT_SONY_MEMSTICK 0x808a /* Memory Stick I/F Controller */
-/* Sun Microsystems products */
+/* Sun Microsystems, Inc. products */
#define PCI_PRODUCT_SUN_EBUS 0x1000 /* PCIO Ebus2 */
#define PCI_PRODUCT_SUN_HMENETWORK 0x1001 /* PCIO Happy Meal Ethernet */
#define PCI_PRODUCT_SUN_EBUSIII 0x1100 /* PCIO Ebus2 (US III) */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 8b7d1e4d614..67932b3c371 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.507 2003/02/18 00:10:32 grant Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.508 2003/02/26 11:51:06 salo Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.506 2003/02/18 00:09:43 grant Exp
+ * NetBSD: pcidevs,v 1.507 2003/02/26 11:48:58 salo Exp
*/
/*
@@ -2196,31 +2196,31 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_CMEDIA, PCI_PRODUCT_CMEDIA_CMI8338A,
0,
- "C-Media Electronics Inc",
+ "C-Media Electronics, Inc.",
"CMI8338A PCI Audio Device",
},
{
PCI_VENDOR_CMEDIA, PCI_PRODUCT_CMEDIA_CMI8338B,
0,
- "C-Media Electronics Inc",
+ "C-Media Electronics, Inc.",
"CMI8338B PCI Audio Device",
},
{
PCI_VENDOR_CMEDIA, PCI_PRODUCT_CMEDIA_CMI8738,
0,
- "C-Media Electronics Inc",
+ "C-Media Electronics, Inc.",
"CMI8738/C3DX PCI Audio Device",
},
{
PCI_VENDOR_CMEDIA, PCI_PRODUCT_CMEDIA_CMI8738B,
0,
- "C-Media Electronics Inc",
+ "C-Media Electronics, Inc.",
"CMI8738B PCI Audio Device",
},
{
PCI_VENDOR_CMEDIA, PCI_PRODUCT_CMEDIA_HSP56,
0,
- "C-Media Electronics Inc",
+ "C-Media Electronics, Inc.",
"HSP56 Audiomodem Riser",
},
{
@@ -2868,55 +2868,55 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_MAESTRO1,
0,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
"Maestro 1 PCI Audio Accelerator",
},
{
PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_MAESTRO2,
0,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
"Maestro 2 PCI Audio Accelerator",
},
{
PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_SOLO1,
0,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
"Solo-1 PCI AudioDrive",
},
{
PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_MAESTRO2E,
0,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
"Maestro 2E PCI Audio Accelerator",
},
{
PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_ALLEGRO1,
0,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
"Allegro-1 PCI Audio Accelerator",
},
{
PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_MAESTRO3,
0,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
"Maestro 3 PCI Audio Accelerator",
},
{
PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_MAESTRO3MODEM,
0,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
"Maestro 3 Modem",
},
{
PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_MAESTRO3_2,
0,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
"Maestro 3 PCI Audio Accelerator",
},
{
PCI_VENDOR_ESSTECH2, PCI_PRODUCT_ESSTECH2_MAESTRO1,
0,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
"Maestro 1 PCI Audio Accelerator",
},
{
@@ -2928,37 +2928,37 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6729,
0,
- "O2 Micro Inc",
+ "O2 Micro, Inc.",
"OZ6729 PCI-PCMCIA Bridge",
},
{
PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6730,
0,
- "O2 Micro Inc",
+ "O2 Micro, Inc.",
"OZ6730 PCI-PCMCIA Bridge",
},
{
PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6832,
0,
- "O2 Micro Inc",
+ "O2 Micro, Inc.",
"OZ6832/OZ6833 PCI-CardBus Bridge",
},
{
PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6860,
0,
- "O2 Micro Inc",
+ "O2 Micro, Inc.",
"OZ6860 PCI-Cardbus Bridge",
},
{
PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6872,
0,
- "O2 Micro Inc",
+ "O2 Micro, Inc.",
"OZ6812/OZ6872 PCI-Cardbus Bridge",
},
{
PCI_VENDOR_O2MICRO, PCI_PRODUCT_O2MICRO_OZ6972,
0,
- "O2 Micro Inc",
+ "O2 Micro, Inc.",
"OZ6912/OZ6972 PCI-Cardbus Bridge",
},
{
@@ -4914,7 +4914,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_MEDIAQ, PCI_PRODUCT_MEDIAQ_MQ200,
0,
- "MediaQ Inc.",
+ "MediaQ, Inc.",
"MQ200",
},
{
@@ -6466,18 +6466,48 @@ const struct pci_knowndev pci_knowndevs[] = {
"SiS 7018 Sound",
},
{
- PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_LYNX_EMP,
+ PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_SM710,
0,
- "Silicon Motion",
+ "Silicon Motion, Inc.",
+ "Lynx EM",
+ },
+ {
+ PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_SM712,
+ 0,
+ "Silicon Motion, Inc.",
"Lynx EM+",
},
{
- PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_LYNX_E,
+ PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_SM720,
+ 0,
+ "Silicon Motion, Inc.",
+ "Lynx 3DM",
+ },
+ {
+ PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_SM810,
+ 0,
+ "Silicon Motion, Inc.",
+ "Lynx E",
+ },
+ {
+ PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_SM811,
0,
- "Silicon Motion",
+ "Silicon Motion, Inc.",
"Lynx E",
},
{
+ PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_SM820,
+ 0,
+ "Silicon Motion, Inc.",
+ "Lynx 3D",
+ },
+ {
+ PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_SM910,
+ 0,
+ "Silicon Motion, Inc.",
+ "Lynx",
+ },
+ {
PCI_VENDOR_SMC, PCI_PRODUCT_SMC_37C665,
0,
"Standard Microsystems",
@@ -6540,73 +6570,73 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_EBUS,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"PCIO Ebus2",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_HMENETWORK,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"PCIO Happy Meal Ethernet",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_EBUSIII,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"PCIO Ebus2 (US III)",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_ERINETWORK,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"ERI Ethernet",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_FIREWIRE,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"FireWire controller",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_USB,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"USB controller",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_GEMNETWORK,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"GEM Gigabit Ethernet",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_SIMBA,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"Simba PCI bridge",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_PSYCHO,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"psycho PCI controller",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_MS_IIep,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"microSPARC IIep PCI",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_US_IIi,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"UltraSPARC IIi PCI",
},
{
PCI_VENDOR_SUN, PCI_PRODUCT_SUN_US_IIe,
0,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
"UltraSPARC IIe PCI",
},
{
@@ -9072,7 +9102,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_SUN, 0,
PCI_KNOWNDEV_NOPROD,
- "Sun Microsystems",
+ "Sun Microsystems, Inc.",
NULL,
},
{
@@ -10320,7 +10350,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_RENDITION, 0,
PCI_KNOWNDEV_NOPROD,
- "Rendition Inc.",
+ "Rendition, Inc.",
NULL,
},
{
@@ -10908,7 +10938,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_O2MICRO, 0,
PCI_KNOWNDEV_NOPROD,
- "O2 Micro Inc",
+ "O2 Micro, Inc.",
NULL,
},
{
@@ -10986,7 +11016,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_ESSTECH, 0,
PCI_KNOWNDEV_NOPROD,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
NULL,
},
{
@@ -10998,7 +11028,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_SILMOTION, 0,
PCI_KNOWNDEV_NOPROD,
- "Silicon Motion",
+ "Silicon Motion, Inc.",
NULL,
},
{
@@ -11034,7 +11064,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_ESSTECH2, 0,
PCI_KNOWNDEV_NOPROD,
- "ESS Technology Inc",
+ "ESS Technology, Inc.",
NULL,
},
{
@@ -11106,7 +11136,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_SIIG, 0,
PCI_KNOWNDEV_NOPROD,
- "Siig Inc.",
+ "Siig, Inc.",
NULL,
},
{
@@ -11160,7 +11190,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_CMEDIA, 0,
PCI_KNOWNDEV_NOPROD,
- "C-Media Electronics Inc",
+ "C-Media Electronics, Inc.",
NULL,
},
{
@@ -11412,7 +11442,7 @@ const struct pci_knowndev pci_knowndevs[] = {
{
PCI_VENDOR_MEDIAQ, 0,
PCI_KNOWNDEV_NOPROD,
- "MediaQ Inc.",
+ "MediaQ, Inc.",
NULL,
},
{
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 523148d6342..d97c11e3658 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_pci.c,v 1.20 2002/10/02 16:51:59 thorpej Exp $ */
+/* $NetBSD: vga_pci.c,v 1.21 2003/02/26 11:51:06 salo Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.20 2002/10/02 16:51:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.21 2003/02/26 11:51:06 salo Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ static const struct {
int id;
int quirks;
} vga_pci_quirks[] = {
- {PCI_ID_CODE(PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_LYNX_EMP),
+ {PCI_ID_CODE(PCI_VENDOR_SILMOTION, PCI_PRODUCT_SILMOTION_SM712),
VGA_QUIRK_NOFASTSCROLL},
};