diff options
| author | Greg Kroah-Hartman | 2010-05-01 02:36:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-05-11 20:35:59 +0200 |
| commit | 6608224c9e5c8aacf88914697be2d5f1fc7a0be6 (patch) | |
| tree | e4a9ff2d24fb8a6bce7b76d7b883c08a5867af44 /drivers/staging | |
| parent | Staging: comedi: move another pci vendor id (diff) | |
| download | kernel-qcow2-linux-6608224c9e5c8aacf88914697be2d5f1fc7a0be6.tar.gz kernel-qcow2-linux-6608224c9e5c8aacf88914697be2d5f1fc7a0be6.tar.xz kernel-qcow2-linux-6608224c9e5c8aacf88914697be2d5f1fc7a0be6.zip | |
Staging: comedi: remove another vendor id
This id was already in the drivers, so just use it there
instead of in a common header file.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 1 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_dio200.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pci224.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 5592cd162cdb..f5b0810f2258 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -109,7 +109,6 @@ COMEDI_MODULE_MACROS \ COMEDI_PCI_INITCLEANUP_NOMODULE(comedi_driver, pci_id_table) -#define PCI_VENDOR_ID_AMPLICON 0x14dc #define PCI_VENDOR_ID_ADLINK 0x144a #define PCI_VENDOR_ID_ICP 0x104c #define PCI_VENDOR_ID_CONTEC 0x1221 diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c index 92bcc205dd4b..6a87652e7e2a 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/drivers/staging/comedi/drivers/amplc_dio200.c @@ -218,7 +218,7 @@ order they appear in the channel list. #define DIO200_DRIVER_NAME "amplc_dio200" /* PCI IDs */ -/* #define PCI_VENDOR_ID_AMPLICON 0x14dc */ +#define PCI_VENDOR_ID_AMPLICON 0x14dc #define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a #define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b #define PCI_DEVICE_ID_INVALID 0xffff diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index 8af156dca17e..c486a878e180 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c @@ -118,7 +118,7 @@ Caveats: /* * PCI IDs. */ -/* #define PCI_VENDOR_ID_AMPLICON 0x14dc */ +#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 |