On 2012-10-25 00:29, H Hartley Sweeten wrote:
Add a define for the ComputerBoards/Measurement Computing PCI
vendor id. Remove the duplicates in the drivers.
Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/comedi/comedidev.h | 6 +++-
drivers/staging/comedi/drivers/8255_pci.c | 3 --
drivers/staging/comedi/drivers/cb_pcidas.c | 3 --
drivers/staging/comedi/drivers/cb_pcidas64.c | 42 +++++++++++++---------------
drivers/staging/comedi/drivers/cb_pcidda.c | 1 -
drivers/staging/comedi/drivers/cb_pcimdas.c | 4 +--
drivers/staging/comedi/drivers/cb_pcimdda.c | 3 +-
drivers/staging/comedi/drivers/das08.c | 3 +-
8 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/comedi/comedidev.h
b/drivers/staging/comedi/comedidev.h
index 78a44fc..78bc062 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -54,9 +54,13 @@
COMEDI_MINORVERSION, COMEDI_MICROVERSION)
#define COMEDI_RELEASE VERSION
-#define PCI_VENDOR_ID_ADLINK 0x144a
+/*
+ * PCI Vendor IDs not in <linux/pci_ids.h>
+ */
#define PCI_VENDOR_ID_ICP 0x104c
#define PCI_VENDOR_ID_CONTEC 0x1221
+#define PCI_VENDOR_ID_CB 0x1307 /* Measurement Computing */
PCI_VENDOR_ID_COMPUTERBOARDS would be preferred if this vendor ID ever
gets migrated to include/linux/pci_ids.h, but I suppose this
PCI_VENDOR_ID_CB is fine for use just within comedidev.h.
(As an aside, some of these vendor IDs actually clash with official
vendor IDs, for example PCI_VENDOR_ID_ICP 0x104c actually belongs to
Texas Instruments!)
--
-=( Ian Abbott @ MEV Ltd. E-mail: <[email protected]> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
