diff options
-rw-r--r-- | drivers/video/geode/gxfb_core.c | 2 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c index 0d3643fc6293..a454dcb8e215 100644 --- a/drivers/video/geode/gxfb_core.c +++ b/drivers/video/geode/gxfb_core.c | |||
@@ -380,7 +380,7 @@ static void gxfb_remove(struct pci_dev *pdev) | |||
380 | } | 380 | } |
381 | 381 | ||
382 | static struct pci_device_id gxfb_id_table[] = { | 382 | static struct pci_device_id gxfb_id_table[] = { |
383 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_VIDEO, | 383 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_GX_VIDEO, |
384 | PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16, | 384 | PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16, |
385 | 0xff0000, 0 }, | 385 | 0xff0000, 0 }, |
386 | { 0, } | 386 | { 0, } |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index dcdb90f06d73..ff2dcb436cd0 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -390,7 +390,7 @@ | |||
390 | #define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d | 390 | #define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d |
391 | #define PCI_DEVICE_ID_NS_CS5535_AUDIO 0x002e | 391 | #define PCI_DEVICE_ID_NS_CS5535_AUDIO 0x002e |
392 | #define PCI_DEVICE_ID_NS_CS5535_USB 0x002f | 392 | #define PCI_DEVICE_ID_NS_CS5535_USB 0x002f |
393 | #define PCI_DEVICE_ID_NS_CS5535_VIDEO 0x0030 | 393 | #define PCI_DEVICE_ID_NS_GX_VIDEO 0x0030 |
394 | #define PCI_DEVICE_ID_NS_SATURN 0x0035 | 394 | #define PCI_DEVICE_ID_NS_SATURN 0x0035 |
395 | #define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500 | 395 | #define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500 |
396 | #define PCI_DEVICE_ID_NS_SCx200_SMI 0x0501 | 396 | #define PCI_DEVICE_ID_NS_SCx200_SMI 0x0501 |
@@ -403,8 +403,7 @@ | |||
403 | #define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515 | 403 | #define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515 |
404 | #define PCI_DEVICE_ID_NS_87410 0xd001 | 404 | #define PCI_DEVICE_ID_NS_87410 0xd001 |
405 | 405 | ||
406 | #define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE 0x0028 | 406 | #define PCI_DEVICE_ID_NS_GX_HOST_BRIDGE 0x0028 |
407 | #define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE 0x002b | ||
408 | 407 | ||
409 | #define PCI_VENDOR_ID_TSENG 0x100c | 408 | #define PCI_VENDOR_ID_TSENG 0x100c |
410 | #define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 | 409 | #define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 |