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>
This commit is contained in:
Greg Kroah-Hartman 2010-04-30 17:36:52 -07:00
Родитель 59af888d6a
Коммит 6608224c9e
3 изменённых файлов: 2 добавлений и 3 удалений

Просмотреть файл

@ -109,7 +109,6 @@
COMEDI_MODULE_MACROS \ COMEDI_MODULE_MACROS \
COMEDI_PCI_INITCLEANUP_NOMODULE(comedi_driver, pci_id_table) 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_ADLINK 0x144a
#define PCI_VENDOR_ID_ICP 0x104c #define PCI_VENDOR_ID_ICP 0x104c
#define PCI_VENDOR_ID_CONTEC 0x1221 #define PCI_VENDOR_ID_CONTEC 0x1221

Просмотреть файл

@ -218,7 +218,7 @@ order they appear in the channel list.
#define DIO200_DRIVER_NAME "amplc_dio200" #define DIO200_DRIVER_NAME "amplc_dio200"
/* PCI IDs */ /* 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_PCI272 0x000a
#define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b #define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b
#define PCI_DEVICE_ID_INVALID 0xffff #define PCI_DEVICE_ID_INVALID 0xffff

Просмотреть файл

@ -118,7 +118,7 @@ Caveats:
/* /*
* PCI IDs. * 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_PCI224 0x0007
#define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008 #define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008
#define PCI_DEVICE_ID_INVALID 0xffff #define PCI_DEVICE_ID_INVALID 0xffff