---

yaml --- r: 197154 b: refs/heads/master c: 47c9285 h: refs/heads/master v: v3
git-mirror · May 11, 2010 · d0df931 · d0df931
1 parent 94cbe8b
commit d0df931
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e81f184d9fc3c607a2f0b236d765eb348fbd845
+refs/heads/master: 47c92858446004d3cf28d8115266d631cdfd5d0a
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9118.c b/trunk/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -63,7 +63,6 @@ Configuration options:
 
 */
 #include "../comedidev.h"
-#include "../pci_ids.h"
 
 #include <linux/delay.h>
 #include <linux/gfp.h>
@@ -74,6 +73,8 @@ Configuration options:
 #include "comedi_pci.h"
 #include "comedi_fc.h"
 
+#define PCI_VENDOR_ID_AMCC	0x10e8
+
 /* paranoid checks are broken */
 #undef PCI9118_PARANOIDCHECK	/*
 				 * if defined, then is used code which control

diff --git a/trunk/drivers/staging/comedi/pci_ids.h b/trunk/drivers/staging/comedi/pci_ids.h