---

yaml --- r: 337643 b: refs/heads/master c: 00d9319 h: refs/heads/master i: 337641: 6a03869 337639: 5cb4caa v: v3
git-mirror · Nov 2, 2012 · ab87379 · ab87379
1 parent dbc5507
commit ab87379
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3b81d54585b2b050257228555f15c0e507024d1
+refs/heads/master: 00d9319475a80d372de726c7cabbfb45d7531a24
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9118.c b/trunk/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -208,8 +208,7 @@ static const struct comedi_lrange range_pci9118hg = { 8, {
 
 struct boardtype {
 	const char *name;		/* board name */
-	int vendor_id;			/* PCI vendor a device ID of card */
-	int device_id;
+	int device_id;			/* PCI device ID of card */
 	int iorange_amcc;		/* iorange for own S5933 region */
 	int iorange_9118;		/* pass thru card region size */
 	int n_aichan;			/* num of A/D chans */
@@ -2131,7 +2130,6 @@ static void pci9118_detach(struct comedi_device *dev)
 static const struct boardtype boardtypes[] = {
 	{
 		.name		= "pci9118dg",
-		.vendor_id	= PCI_VENDOR_ID_AMCC,
 		.device_id	= 0x80d9,
 		.iorange_amcc	= AMCC_OP_REG_SIZE,
 		.iorange_9118	= IORANGE_9118,
@@ -2149,7 +2147,6 @@ static const struct boardtype boardtypes[] = {
 		.half_fifo_size	= 512,
 	}, {
 		.name		= "pci9118hg",
-		.vendor_id	= PCI_VENDOR_ID_AMCC,
 		.device_id	= 0x80d9,
 		.iorange_amcc	= AMCC_OP_REG_SIZE,
 		.iorange_9118	= IORANGE_9118,
@@ -2167,7 +2164,6 @@ static const struct boardtype boardtypes[] = {
 		.half_fifo_size	= 512,
 	}, {
 		.name		= "pci9118hr",
-		.vendor_id	= PCI_VENDOR_ID_AMCC,
 		.device_id	= 0x80d9,
 		.iorange_amcc	= AMCC_OP_REG_SIZE,
 		.iorange_9118	= IORANGE_9118,