Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / comedi / drivers / rtd520.c

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index a49a7c566d37387adbf1de473e82fda0584d7325..60ebfc3c75fdb08aac1c22798d782d148006656d 100644 (file)
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -329,10 +329,9 @@ static const struct rtdBoard rtd520Boards[] = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(rtd520_pci_table) = {
-       {
-       PCI_VENDOR_ID_RTD, 0x7520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_RTD, 0x4520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       { PCI_DEVICE(PCI_VENDOR_ID_RTD, 0x7520) },
+       { PCI_DEVICE(PCI_VENDOR_ID_RTD, 0x4520) },
+       { 0 }
 };
 
 MODULE_DEVICE_TABLE(pci, rtd520_pci_table);