From 8392ccbbfe91fd7d380a6ac7893f94ce688017c8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 30 Apr 2010 17:36:52 -0700 Subject: [PATCH] --- yaml --- r: 197162 b: refs/heads/master c: 6608224c9e5c8aacf88914697be2d5f1fc7a0be6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 1 - trunk/drivers/staging/comedi/drivers/amplc_dio200.c | 2 +- trunk/drivers/staging/comedi/drivers/amplc_pci224.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7aec5c246fdc..686ccb949629 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59af888d6af8e3d2c91b32e00e43f2ce750589b8 +refs/heads/master: 6608224c9e5c8aacf88914697be2d5f1fc7a0be6 diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 5592cd162cdb..f5b0810f2258 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_AMPLICON 0x14dc #define PCI_VENDOR_ID_ADLINK 0x144a #define PCI_VENDOR_ID_ICP 0x104c #define PCI_VENDOR_ID_CONTEC 0x1221 diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c index 92bcc205dd4b..6a87652e7e2a 100644 --- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c @@ -218,7 +218,7 @@ order they appear in the channel list. #define DIO200_DRIVER_NAME "amplc_dio200" /* PCI IDs */ -/* #define PCI_VENDOR_ID_AMPLICON 0x14dc */ +#define PCI_VENDOR_ID_AMPLICON 0x14dc #define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a #define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b #define PCI_DEVICE_ID_INVALID 0xffff diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pci224.c b/trunk/drivers/staging/comedi/drivers/amplc_pci224.c index 8af156dca17e..c486a878e180 100644 --- a/trunk/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/trunk/drivers/staging/comedi/drivers/amplc_pci224.c @@ -118,7 +118,7 @@ Passing a zero for an option is the same as leaving it unspecified. /* * PCI IDs. */ -/* #define PCI_VENDOR_ID_AMPLICON 0x14dc */ +#define PCI_VENDOR_ID_AMPLICON 0x14dc #define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007 #define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008 #define PCI_DEVICE_ID_INVALID 0xffff