From 6e3dd2562c99f6139aecafa4c877facd9a2a5fda Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 21 Jan 2013 16:02:20 -0700 Subject: [PATCH] --- yaml --- r: 354130 b: refs/heads/master c: b194218dba531b9c36080d29d10fdf9ef96a15bf h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_16xx.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e2337ea1e3a4..e2f9bfe652d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e72c1744fda105e0f1de6e33bd901a4df1bbaed +refs/heads/master: b194218dba531b9c36080d29d10fdf9ef96a15bf diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c b/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c index 34af45388b88..a04d66ce8a35 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c @@ -31,6 +31,12 @@ #include "../comedidev.h" +/* + * PCI device ids supported by this driver + */ +#define PCI_DEVICE_ID_APCI1648 0x1009 +#define PCI_DEVICE_ID_APCI1696 0x100a + /* * Register I/O map */ @@ -49,12 +55,12 @@ static const struct apci16xx_boardinfo apci16xx_boardtypes[] = { { .name = "apci1648", .vendor = PCI_VENDOR_ID_ADDIDATA, - .device = 0x1009, + .device = PCI_DEVICE_ID_APCI1648, .n_chan = 48, /* 2 subdevices */ }, { .name = "apci1696", .vendor = PCI_VENDOR_ID_ADDIDATA, - .device = 0x100A, + .device = PCI_DEVICE_ID_APCI1696, .n_chan = 96, /* 3 subdevices */ }, }; @@ -228,8 +234,8 @@ static void apci16xx_pci_remove(struct pci_dev *dev) } static DEFINE_PCI_DEVICE_TABLE(apci16xx_pci_table) = { - { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1009) }, - { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x100a) }, + { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1648) }, + { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1696) }, { 0 } }; MODULE_DEVICE_TABLE(pci, apci16xx_pci_table);