Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337278
b: refs/heads/master
c: 00f5c77
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 25, 2012
1 parent f650cb6 commit e796414
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 268533124d621360710e08e0ce71a3f5313b6c78
refs/heads/master: 00f5c774a0f551e297c343222d17a3f919c603d3
4 changes: 1 addition & 3 deletions trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
#include "../comedidev.h"
#include <linux/mutex.h>

#define PCI_VENDOR_ID_DYNALOG 0x10b5

#define READ_TIMEOUT 50

static const struct comedi_lrange range_pci1050_ai = { 3, {
Expand Down Expand Up @@ -283,7 +281,7 @@ static void __devexit dyna_pci10xx_pci_remove(struct pci_dev *dev)
}

static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_DYNALOG, 0x1050) },
{ PCI_DEVICE(PCI_VENDOR_ID_PLX, 0x1050) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, dyna_pci10xx_pci_table);
Expand Down

0 comments on commit e796414

Please sign in to comment.