Merge omap-drivers

[linux-2.6-omap-h63xx.git] / drivers / video / sunxvr2500.c

diff --git a/drivers/video/sunxvr2500.c b/drivers/video/sunxvr2500.c
index 4010492c692004a379ab64d754646df567a20131..4316c7fe8e21c52d92fa4cca203bb796d7594a54 100644 (file)
--- a/drivers/video/sunxvr2500.c
+++ b/drivers/video/sunxvr2500.c
@@ -237,14 +237,14 @@ static void __devexit s3d_pci_unregister(struct pci_dev *pdev)
 }
 
 static struct pci_device_id s3d_pci_table[] = {
-       {       /* XVR-2500 */
-               PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0032),
-               .driver_data = 1,
-       },
-       {       /* XVR-500 */
-               PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x07a2),
-               .driver_data = 0,
-       },
+       {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002c),       },
+       {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002d),       },
+       {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002e),       },
+       {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002f),       },
+       {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0030),       },
+       {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0031),       },
+       {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0032),       },
+       {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0033),       },
        { 0, }
 };