Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[pandora-kernel.git] / drivers / staging / comedi / drivers / ni_65xx.c

diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 9a4fffe..d793f5a 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -266,30 +266,29 @@ static inline unsigned ni_65xx_total_num_ports(const struct ni_65xx_board
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ni_65xx_pci_table) = {
-       {
-       PCI_VENDOR_ID_NATINST, 0x1710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7085, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7086, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7087, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7088, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70a9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70c3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70c8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70c9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70cc, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70CD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70d1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70d2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x70d3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7125, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7126, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7127, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x7128, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x718b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x718c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       PCI_VENDOR_ID_NATINST, 0x71c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-       0}
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1710)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7085)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7086)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7087)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7088)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70a9)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c3)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c8)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c9)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70cc)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70CD)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d1)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d2)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d3)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7124)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7125)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7126)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7127)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7128)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x718b)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x718c)},
+       {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x71c5)},
+       {0}
 };
 
 MODULE_DEVICE_TABLE(pci, ni_65xx_pci_table);