diff options
-rw-r--r-- | drivers/staging/comedi/comedidev.h | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/amplc_dio200.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/amplc_pc236.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/amplc_pc263.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/amplc_pci224.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/amplc_pci230.c | 1 |
6 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 8c4847c84224..d9f2b8bfe6fd 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h | |||
@@ -68,6 +68,7 @@ | |||
68 | #define PCI_VENDOR_ID_MEILHAUS 0x1402 | 68 | #define PCI_VENDOR_ID_MEILHAUS 0x1402 |
69 | #define PCI_VENDOR_ID_RTD 0x1435 | 69 | #define PCI_VENDOR_ID_RTD 0x1435 |
70 | #define PCI_VENDOR_ID_ADLINK 0x144a | 70 | #define PCI_VENDOR_ID_ADLINK 0x144a |
71 | #define PCI_VENDOR_ID_AMPLICON 0x14dc | ||
71 | 72 | ||
72 | #define COMEDI_NUM_MINORS 0x100 | 73 | #define COMEDI_NUM_MINORS 0x100 |
73 | #define COMEDI_NUM_BOARD_MINORS 0x30 | 74 | #define COMEDI_NUM_BOARD_MINORS 0x30 |
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c index 95c3f7824d81..ffe3f7385c7c 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/drivers/staging/comedi/drivers/amplc_dio200.c | |||
@@ -272,7 +272,6 @@ | |||
272 | #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI) | 272 | #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI) |
273 | 273 | ||
274 | /* PCI IDs */ | 274 | /* PCI IDs */ |
275 | #define PCI_VENDOR_ID_AMPLICON 0x14dc | ||
276 | #define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a | 275 | #define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a |
277 | #define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b | 276 | #define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b |
278 | #define PCI_DEVICE_ID_AMPLICON_PCIE236 0x0011 | 277 | #define PCI_DEVICE_ID_AMPLICON_PCIE236 0x0011 |
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index 52541c95ba65..c4516355b347 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c | |||
@@ -66,7 +66,6 @@ unused. | |||
66 | #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI) | 66 | #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI) |
67 | 67 | ||
68 | /* PCI236 PCI configuration register information */ | 68 | /* PCI236 PCI configuration register information */ |
69 | #define PCI_VENDOR_ID_AMPLICON 0x14dc | ||
70 | #define PCI_DEVICE_ID_AMPLICON_PCI236 0x0009 | 69 | #define PCI_DEVICE_ID_AMPLICON_PCI236 0x0009 |
71 | #define PCI_DEVICE_ID_INVALID 0xffff | 70 | #define PCI_DEVICE_ID_INVALID 0xffff |
72 | 71 | ||
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c index 60830ccfb903..0369996a3839 100644 --- a/drivers/staging/comedi/drivers/amplc_pc263.c +++ b/drivers/staging/comedi/drivers/amplc_pc263.c | |||
@@ -52,7 +52,6 @@ The state of the outputs can be read. | |||
52 | #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC263_PCI) | 52 | #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC263_PCI) |
53 | 53 | ||
54 | /* PCI263 PCI configuration register information */ | 54 | /* PCI263 PCI configuration register information */ |
55 | #define PCI_VENDOR_ID_AMPLICON 0x14dc | ||
56 | #define PCI_DEVICE_ID_AMPLICON_PCI263 0x000c | 55 | #define PCI_DEVICE_ID_AMPLICON_PCI263 0x000c |
57 | #define PCI_DEVICE_ID_INVALID 0xffff | 56 | #define PCI_DEVICE_ID_INVALID 0xffff |
58 | 57 | ||
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index 6a9ec11c4f07..610f2ce8fa12 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c | |||
@@ -116,7 +116,6 @@ Caveats: | |||
116 | /* | 116 | /* |
117 | * PCI IDs. | 117 | * PCI IDs. |
118 | */ | 118 | */ |
119 | #define PCI_VENDOR_ID_AMPLICON 0x14dc | ||
120 | #define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007 | 119 | #define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007 |
121 | #define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008 | 120 | #define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008 |
122 | #define PCI_DEVICE_ID_INVALID 0xffff | 121 | #define PCI_DEVICE_ID_INVALID 0xffff |
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index 2675eefe8b5a..d66d7d797f7c 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c | |||
@@ -198,7 +198,6 @@ for (or detection of) various hardware problems added by Ian Abbott. | |||
198 | #include "8255.h" | 198 | #include "8255.h" |
199 | 199 | ||
200 | /* PCI230 PCI configuration register information */ | 200 | /* PCI230 PCI configuration register information */ |
201 | #define PCI_VENDOR_ID_AMPLICON 0x14dc | ||
202 | #define PCI_DEVICE_ID_PCI230 0x0000 | 201 | #define PCI_DEVICE_ID_PCI230 0x0000 |
203 | #define PCI_DEVICE_ID_PCI260 0x0006 | 202 | #define PCI_DEVICE_ID_PCI260 0x0006 |
204 | #define PCI_DEVICE_ID_INVALID 0xffff | 203 | #define PCI_DEVICE_ID_INVALID 0xffff |