Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337274
b: refs/heads/master
c: 0d37462
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 25, 2012
1 parent 8c34c77 commit ecd06e1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 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: f656ef5b6c15e518dde43a6d6ae6c47dccc6c920
refs/heads/master: 0d374622a8a45dec37702a40c803fb9e9e9cb8e0
1 change: 1 addition & 0 deletions trunk/drivers/staging/comedi/comedidev.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
/*
* PCI Vendor IDs not in <linux/pci_ids.h>
*/
#define PCI_VENDOR_ID_KOLTER 0x1001
#define PCI_VENDOR_ID_ICP 0x104c
#define PCI_VENDOR_ID_DT 0x1116
#define PCI_VENDOR_ID_CONTEC 0x1221
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/staging/comedi/drivers/ke_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Kolter Electronic PCI Counter Card.

#include "../comedidev.h"

#define PCI_VENDOR_ID_KOLTER 0x1001
#define CNT_CARD_DEVICE_ID 0x0014

/*-- counter write ----------------------------------------------------------*/
Expand Down

0 comments on commit ecd06e1

Please sign in to comment.