diff options
| author | Greg Kroah-Hartman | 2010-05-01 02:07:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-05-11 20:35:58 +0200 |
| commit | 3ca88dd5c3c6739f685793539a679ab5ac85aca3 (patch) | |
| tree | e661e713afd34577f141b6ff8ba03291cb5e9a87 /drivers/staging | |
| parent | Staging: comedi: remove some pci vendor ids (diff) | |
| download | kernel-qcow2-linux-3ca88dd5c3c6739f685793539a679ab5ac85aca3.tar.gz kernel-qcow2-linux-3ca88dd5c3c6739f685793539a679ab5ac85aca3.tar.xz kernel-qcow2-linux-3ca88dd5c3c6739f685793539a679ab5ac85aca3.zip | |
Staging: comedi: move a pci vendor id
The vendor id should be in the driver that needs it, not in
a common 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/me_daq.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 162ac8d913e5..09d3c51097f7 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -115,7 +115,6 @@ #define PCI_VENDOR_ID_ADLINK 0x144a #define PCI_VENDOR_ID_ICP 0x104c #define PCI_VENDOR_ID_CONTEC 0x1221 -#define PCI_VENDOR_ID_MEILHAUS 0x1402 #define COMEDI_NUM_MINORS 0x100 #define COMEDI_NUM_BOARD_MINORS 0x30 diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index 80e192d2e77e..c8484aec657d 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c @@ -60,6 +60,7 @@ from http://www.comedi.org #define ME_DRIVER_NAME "me_daq" +#define PCI_VENDOR_ID_MEILHAUS 0x1402 #define ME2000_DEVICE_ID 0x2000 #define ME2600_DEVICE_ID 0x2600 |