diff --git a/[refs] b/[refs] index d9ff9eb196e7..477a92a89d8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81b621dafcac93719a2bd33ff16e6c86ed6b80ad +refs/heads/master: 37907697db946683fa87e40996beb96cf0fe2de5 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c index ced346a7cae3..16c322d040fd 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c @@ -126,10 +126,8 @@ static const struct cb_pcimdas_board cb_pcimdas_boards[] = { /* This is used by modprobe to translate PCI IDs to drivers. Should * only be used for PCI and ISA-PnP devices */ static DEFINE_PCI_DEVICE_TABLE(cb_pcimdas_pci_table) = { - { - PCI_VENDOR_ID_COMPUTERBOARDS, 0x0056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - { - 0} + { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, 0x0056) }, + { 0 } }; MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);