From 226f227aa298d4484d185f3d59fae573062c8437 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 30 Apr 2010 17:32:04 -0700
Subject: [PATCH] --- yaml --- r: 197161 b: refs/heads/master c:
 59af888d6af8e3d2c91b32e00e43f2ce750589b8 h: refs/heads/master i:   197159:
 9ac5451abf29866ff411f1aceb6327918edc8a03 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/comedi/comedidev.h           | 1 -
 trunk/drivers/staging/comedi/drivers/adv_pci1710.c | 2 ++
 trunk/drivers/staging/comedi/drivers/adv_pci1723.c | 4 ++--
 trunk/drivers/staging/comedi/drivers/adv_pci_dio.c | 2 ++
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 470cb5c8c41f..7aec5c246fdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 558587e2d96a4f5439a609509e4ea88f7536203b
+refs/heads/master: 59af888d6af8e3d2c91b32e00e43f2ce750589b8
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
index 8f842f85a105..5592cd162cdb 100644
--- a/trunk/drivers/staging/comedi/comedidev.h
+++ b/trunk/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_ADVANTECH		0x13fe
 #define PCI_VENDOR_ID_AMPLICON		0x14dc
 #define PCI_VENDOR_ID_ADLINK		0x144a
 #define PCI_VENDOR_ID_ICP		0x104c
diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
index f5bb286bfbd7..5c1ff779af2c 100644
--- a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -63,6 +63,8 @@ Configuration options:
 #define DPRINTK(fmt, args...)
 #endif
 
+#define PCI_VENDOR_ID_ADVANTECH		0x13fe
+
 /* hardware types of the cards */
 #define TYPE_PCI171X	0
 #define TYPE_PCI1713	2
diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1723.c b/trunk/drivers/staging/comedi/drivers/adv_pci1723.c
index 1644490ed0ad..9fe8fcc7f1d6 100644
--- a/trunk/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/trunk/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -52,7 +52,7 @@ configures all channels in the same group.
 
 #include "comedi_pci.h"
 
-#define ADVANTECH_VENDOR        0x13fe	/* Advantech PCI vendor ID */
+#define PCI_VENDOR_ID_ADVANTECH		0x13fe	/* Advantech PCI vendor ID */
 
 /* hardware types of the cards */
 #define TYPE_PCI1723 0
@@ -139,7 +139,7 @@ struct pci1723_board {
 static const struct pci1723_board boardtypes[] = {
 	{
 	 .name = "pci1723",
-	 .vendor_id = ADVANTECH_VENDOR,
+	 .vendor_id = PCI_VENDOR_ID_ADVANTECH,
 	 .device_id = 0x1723,
 	 .iorange = IORANGE_1723,
 	 .cardtype = TYPE_PCI1723,
diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci_dio.c b/trunk/drivers/staging/comedi/drivers/adv_pci_dio.c
index dbfeef8c5bc8..40eeecf5347f 100644
--- a/trunk/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/trunk/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -45,6 +45,8 @@ Configuration options:
 #define DPRINTK(fmt, args...)
 #endif
 
+#define PCI_VENDOR_ID_ADVANTECH		0x13fe
+
 /* hardware types of the cards */
 enum hw_cards_id {
 	TYPE_PCI1730, TYPE_PCI1733, TYPE_PCI1734, TYPE_PCI1736,