From 0bc01feace0e9986c848f6c65f209abd8dc26c23 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 24 Oct 2012 18:14:40 -0700
Subject: [PATCH] --- yaml --- r: 337279 b: refs/heads/master c:
 2847ff5d1b63496c2e3eedb8efad2752cc2e195d h: refs/heads/master i:   337277:
 f650cb64f253155523b8e501bc07776386171be5   337275:
 8e0d5f85346320b869aeaebf0cefd89549e03fd5   337271:
 15de284397d8658aa770d5eab6ed9326b3998066   337263:
 43986769e9ccd25909074736fddac700ab00fd02   337247:
 bbb696d58acfaf0d8e55ea2be954493c41ee9f40   337215:
 cf01e631548480f4389f8e2e75f5341fef08933b   337151:
 b8357338dca65c4b7041115e062f499660e4ed35 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/comedi/comedidev.h            | 1 +
 trunk/drivers/staging/comedi/drivers/amplc_dio200.c | 1 -
 trunk/drivers/staging/comedi/drivers/amplc_pc236.c  | 1 -
 trunk/drivers/staging/comedi/drivers/amplc_pc263.c  | 1 -
 trunk/drivers/staging/comedi/drivers/amplc_pci224.c | 1 -
 trunk/drivers/staging/comedi/drivers/amplc_pci230.c | 1 -
 7 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5a6a8cdd5d8a..e606e839af5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00f5c774a0f551e297c343222d17a3f919c603d3
+refs/heads/master: 2847ff5d1b63496c2e3eedb8efad2752cc2e195d
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
index 8c4847c84224..d9f2b8bfe6fd 100644
--- a/trunk/drivers/staging/comedi/comedidev.h
+++ b/trunk/drivers/staging/comedi/comedidev.h
@@ -68,6 +68,7 @@
 #define PCI_VENDOR_ID_MEILHAUS		0x1402
 #define PCI_VENDOR_ID_RTD		0x1435
 #define PCI_VENDOR_ID_ADLINK		0x144a
+#define PCI_VENDOR_ID_AMPLICON		0x14dc
 
 #define COMEDI_NUM_MINORS 0x100
 #define COMEDI_NUM_BOARD_MINORS 0x30
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
index 95c3f7824d81..ffe3f7385c7c 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -272,7 +272,6 @@
 #define DO_PCI	IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI)
 
 /* PCI IDs */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a
 #define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b
 #define PCI_DEVICE_ID_AMPLICON_PCIE236 0x0011
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pc236.c b/trunk/drivers/staging/comedi/drivers/amplc_pc236.c
index 52541c95ba65..c4516355b347 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -66,7 +66,6 @@ unused.
 #define DO_PCI	IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI)
 
 /* PCI236 PCI configuration register information */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_AMPLICON_PCI236 0x0009
 #define PCI_DEVICE_ID_INVALID 0xffff
 
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pc263.c b/trunk/drivers/staging/comedi/drivers/amplc_pc263.c
index 60830ccfb903..0369996a3839 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -52,7 +52,6 @@ The state of the outputs can be read.
 #define DO_PCI	IS_ENABLED(CONFIG_COMEDI_AMPLC_PC263_PCI)
 
 /* PCI263 PCI configuration register information */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_AMPLICON_PCI263 0x000c
 #define PCI_DEVICE_ID_INVALID 0xffff
 
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pci224.c b/trunk/drivers/staging/comedi/drivers/amplc_pci224.c
index 6a9ec11c4f07..610f2ce8fa12 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -116,7 +116,6 @@ Passing a zero for an option is the same as leaving it unspecified.
 /*
  * PCI IDs.
  */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007
 #define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008
 #define PCI_DEVICE_ID_INVALID 0xffff
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pci230.c b/trunk/drivers/staging/comedi/drivers/amplc_pci230.c
index 2675eefe8b5a..d66d7d797f7c 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -198,7 +198,6 @@ for (or detection of) various hardware problems added by Ian Abbott.
 #include "8255.h"
 
 /* PCI230 PCI configuration register information */
-#define PCI_VENDOR_ID_AMPLICON 0x14dc
 #define PCI_DEVICE_ID_PCI230 0x0000
 #define PCI_DEVICE_ID_PCI260 0x0006
 #define PCI_DEVICE_ID_INVALID 0xffff