Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 2d35143b8e525b5c7d6e19e624e76ce9dee28772..6383fc93b83dc45f46c54f41784e518ec1ef770e 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -196,14 +196,13 @@ static const struct cb_pcidda_board cb_pcidda_boards[] = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcidda_pci_table) = {
-       {
-       PCI_VENDOR_ID_CB, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_CB, 0x0021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_CB, 0x0022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_CB, 0x0023, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_CB, 0x0024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_CB, 0x0025, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0020) },
+       { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0021) },
+       { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0022) },
+       { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0023) },
+       { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0024) },
+       { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0025) },
+       { 0 }
 };
 
 MODULE_DEVICE_TABLE(pci, cb_pcidda_pci_table);