---

yaml --- r: 337270 b: refs/heads/master c: 9409e1d h: refs/heads/master v: v3
git-mirror · Oct 25, 2012 · 39bc486 · 39bc486
1 parent 91246a1
commit 39bc486
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b77d93a0306766456d7d6da21fb6f16c5e129fe6
+refs/heads/master: 9409e1dafe278233d01d0294f63999e2c30e4b90
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -183,7 +183,7 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
 	{PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3007)},
 #endif
 #ifdef CONFIG_APCI_1710
-	{PCI_DEVICE(APCI1710_BOARD_VENDOR_ID, APCI1710_BOARD_DEVICE_ID)},
+	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, APCI1710_BOARD_DEVICE_ID)},
 #endif
 #ifdef CONFIG_APCI_16XX
 	{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1009)},
@@ -594,7 +594,7 @@ static const struct addi_board boardtypes[] = {
 #ifdef CONFIG_APCI_1710
 	{
 		.pc_DriverName		= "apci1710",
-		.i_VendorId		= APCI1710_BOARD_VENDOR_ID,
+		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,
 		.i_DeviceId		= APCI1710_BOARD_DEVICE_ID,
 		.i_IorangeBase0		= 128,
 		.i_IorangeBase1		= 8,

diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
@@ -24,7 +24,6 @@
 #define COMEDI_SUBD_INCREMENTALCOUNTER	17	/* Incremental Counter */
 
 #define APCI1710_BOARD_NAME		"apci1710"
-#define APCI1710_BOARD_VENDOR_ID	0x10E8
 #define APCI1710_BOARD_DEVICE_ID	0x818F
 #define APCI1710_ADDRESS_RANGE		256
 #define APCI1710_CONFIG_ADDRESS_RANGE	8