diff options
-rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 14 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 5f2df1725e6e..1734438f7d7c 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
@@ -1428,6 +1428,20 @@ static struct board { | |||
1428 | MGA_1164, | 1428 | MGA_1164, |
1429 | &vbMystique, | 1429 | &vbMystique, |
1430 | "Mystique 220 (PCI)"}, | 1430 | "Mystique 220 (PCI)"}, |
1431 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MYS_AGP, 0x02, | ||
1432 | 0, 0, | ||
1433 | DEVF_VIDEO64BIT | DEVF_CROSS4MB, | ||
1434 | 180000, | ||
1435 | MGA_1064, | ||
1436 | &vbMystique, | ||
1437 | "Mystique (AGP)"}, | ||
1438 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MYS_AGP, 0xFF, | ||
1439 | 0, 0, | ||
1440 | DEVF_VIDEO64BIT | DEVF_SWAPS | DEVF_CROSS4MB, | ||
1441 | 220000, | ||
1442 | MGA_1164, | ||
1443 | &vbMystique, | ||
1444 | "Mystique 220 (AGP)"}, | ||
1431 | #endif | 1445 | #endif |
1432 | #ifdef CONFIG_FB_MATROX_G | 1446 | #ifdef CONFIG_FB_MATROX_G |
1433 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G100_MM, 0xFF, | 1447 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G100_MM, 0xFF, |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 88de3f8ce1a2..cd62a39ce068 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -519,6 +519,7 @@ | |||
519 | #define PCI_DEVICE_ID_MATROX_MIL 0x0519 | 519 | #define PCI_DEVICE_ID_MATROX_MIL 0x0519 |
520 | #define PCI_DEVICE_ID_MATROX_MYS 0x051A | 520 | #define PCI_DEVICE_ID_MATROX_MYS 0x051A |
521 | #define PCI_DEVICE_ID_MATROX_MIL_2 0x051b | 521 | #define PCI_DEVICE_ID_MATROX_MIL_2 0x051b |
522 | #define PCI_DEVICE_ID_MATROX_MYS_AGP 0x051e | ||
522 | #define PCI_DEVICE_ID_MATROX_MIL_2_AGP 0x051f | 523 | #define PCI_DEVICE_ID_MATROX_MIL_2_AGP 0x051f |
523 | #define PCI_DEVICE_ID_MATROX_MGA_IMP 0x0d10 | 524 | #define PCI_DEVICE_ID_MATROX_MGA_IMP 0x0d10 |
524 | #define PCI_DEVICE_ID_MATROX_G100_MM 0x1000 | 525 | #define PCI_DEVICE_ID_MATROX_G100_MM 0x1000 |