From ea1e8e1cbd95b09aa84506531ab71c3cdd41b297 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 16 Aug 2012 19:51:58 -0700
Subject: [PATCH] --- yaml --- r: 324593 b: refs/heads/master c:
 c8dd8e934087cc0ecf7033786ee00cff4ebcba4f h: refs/heads/master i:   324591:
 3ba5790bb8f9482c865f887d2c0469fe4006d6b4 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/comedi/drivers/cb_pcimdda.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index eb8de3581740..9fcc8c8bb946 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08c3c4077857a7c56b76d1b5b9d50ae3f8190424
+refs/heads/master: c8dd8e934087cc0ecf7033786ee00cff4ebcba4f
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
index ecad85bd0d63..0e346035d070 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -107,9 +107,6 @@ struct cb_pcimdda_board {
 	unsigned short device_id;
 	int ao_chans;
 	int ao_bits;
-	int regs_badrindex;	/* IO Region for the control, analog output,
-				   and DIO registers */
-	int reg_sz;		/* number of bytes of registers in io region */
 };
 
 static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
@@ -118,8 +115,6 @@ static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
 	 .device_id = PCI_ID_PCIM_DDA06_16,
 	 .ao_chans = 6,
 	 .ao_bits = 16,
-	 .regs_badrindex = 3,
-	 .reg_sz = 16,
 	 }
 };
 
@@ -252,7 +247,7 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
 	ret = comedi_pci_enable(pcidev, dev->board_name);
 	if (ret)
 		return ret;
-	dev->iobase = pci_resource_start(pcidev, thisboard->regs_badrindex);
+	dev->iobase = pci_resource_start(pcidev, 3);
 
 	ret = comedi_alloc_subdevices(dev, 2);
 	if (ret)