From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 25 Oct 2012 01:13:43 +0000 (-0700)
Subject: staging: comedi: comedidev.h: add PCI_VENDOR_ID_RTD
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=50d3c3f591958d68a3dd9410c3682c91bd3dda4a;p=deliverable%2Flinux.git

staging: comedi: comedidev.h: add PCI_VENDOR_ID_RTD

Add a define for the RTD Embedded Technologies, Inc. PCI vendor id.
Remove the duplicates in the drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 41f0b5765324..b02d43a32771 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -65,6 +65,7 @@
 #define PCI_VENDOR_ID_CB		0x1307	/* Measurement Computing */
 #define PCI_VENDOR_ID_ADVANTECH		0x13fe
 #define PCI_VENDOR_ID_MEILHAUS		0x1402
+#define PCI_VENDOR_ID_RTD		0x1435
 #define PCI_VENDOR_ID_ADLINK		0x144a
 
 #define COMEDI_NUM_MINORS 0x100
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 0a91738eae33..fc0b1337a471 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -147,8 +147,6 @@ Configuration options:
   Board specific stuff
 ======================================================================*/
 
-/* registers  */
-#define PCI_VENDOR_ID_RTD	0x1435
 /*
   The board has three memory windows: las0, las1, and lcfg (the PCI chip)
   Las1 has the data and can be burst DMAed 32bits at a time.