Merge branch 'master' into csb1725

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

diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index d018bb4e2890619000196343748585c25c755744..9102667ab40e250d321e1407d459c056395e3675 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -256,21 +256,20 @@ struct dio_boardtype {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(pci_dio_pci_table) = {
-       {
-       PCI_VENDOR_ID_ADVANTECH, 0x1730, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1733, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1734, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1735, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1736, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1752, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1753, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1754, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1756, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1760, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_ADVANTECH, 0x1762, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1730) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1733) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1734) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1735) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1736) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1750) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1751) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1752) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1753) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1754) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1756) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1760) },
+       { PCI_DEVICE(PCI_VENDOR_ID_ADVANTECH, 0x1762) },
+       { 0 }
 };
 
 MODULE_DEVICE_TABLE(pci, pci_dio_pci_table);