Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / comedi / drivers / adv_pci1710.c

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index bdd6954cad96f5b863d1cf22cf3a189aa43e120e..466e69f94ef2def8467b0c09fa6341656858851e 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -217,13 +217,12 @@ struct boardtype {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(pci1710_pci_table) = {
-       {
-       PCI_VENDOR_ID_ADVANTECH, 0x1710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1711, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1720, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1731, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1710) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1711) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1713) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1720) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1731) },
+       { 0 }
 };
 
 MODULE_DEVICE_TABLE(pci, pci1710_pci_table);