summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-10-24 18:14:19 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-24 19:39:19 -0700
commit00f5c774a0f551e297c343222d17a3f919c603d3 (patch)
tree0035a33dbfc20c77ac4cf1b46beb209bfaf7e98b
parent268533124d621360710e08e0ce71a3f5313b6c78 (diff)
downloadop-kernel-dev-00f5c774a0f551e297c343222d17a3f919c603d3.zip
op-kernel-dev-00f5c774a0f551e297c343222d17a3f919c603d3.tar.gz
staging: comedi: dyna_pci10xx: remove PCI_VENDOR_ID_DYNALOG
The PCI chip used on this board is from PLX Technologies Inc. As stated in the comments of this driver, Dynalog does not have a registered PCI vendor id so this board uses the PLX vendor id. The kernel provides an id for that vendor in pci_ids.h (PCI_VENDOR_ID_PLX). Use it instead of creating a duplicate with a different name. 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>
-rw-r--r--drivers/staging/comedi/drivers/dyna_pci10xx.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index c345660..656d08b 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -40,8 +40,6 @@
#include "../comedidev.h"
#include <linux/mutex.h>
-#define PCI_VENDOR_ID_DYNALOG 0x10b5
-
#define READ_TIMEOUT 50
static const struct comedi_lrange range_pci1050_ai = { 3, {
@@ -283,7 +281,7 @@ static void __devexit dyna_pci10xx_pci_remove(struct pci_dev *dev)
}
static DEFINE_PCI_DEVICE_TABLE(dyna_pci10xx_pci_table) = {
- { PCI_DEVICE(PCI_VENDOR_ID_DYNALOG, 0x1050) },
+ { PCI_DEVICE(PCI_VENDOR_ID_PLX, 0x1050) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, dyna_pci10xx_pci_table);
OpenPOWER on IntegriCloud