---

yaml
---
r: 337663
b: refs/heads/master
c: 05f22ad
h: refs/heads/master
i:
  337661: 91b89ed
  337659: 5500b39
  337655: 55542d1
  337647: 41dedf2
  337631: beced04
  337599: 3c43b8e
  337535: 858a7d9
  337407: 3a0a194
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c2c1488d382ab79ca364e1ce988a21df9627bf5
+refs/heads/master: 05f22ad7d2c0cc7db70554745bacdddf48452d22

trunk/drivers/staging/comedi/drivers/addi_apci_1032.c

@@ -88,22 +88,10 @@ static int apci1032_attach_pci(struct comedi_device *dev,
 	if (ret)
 		return ret;
 
-	if (!this_board->pc_EepromChip ||
-	    !strcmp(this_board->pc_EepromChip, ADDIDATA_9054)) {
-		if (this_board->i_IorangeBase1)
-			dev->iobase = pci_resource_start(pcidev, 1);
-		else
-			dev->iobase = pci_resource_start(pcidev, 0);
-
-		devpriv->iobase = dev->iobase;
-		devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
-		devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
-	} else {
-		dev->iobase = pci_resource_start(pcidev, 2);
-		devpriv->iobase = pci_resource_start(pcidev, 2);
-		devpriv->dw_AiBase = ioremap(pci_resource_start(pcidev, 3),
-					     this_board->i_IorangeBase3);
-	}
+	dev->iobase = pci_resource_start(pcidev, 2);
+	devpriv->iobase = pci_resource_start(pcidev, 2);
+	devpriv->dw_AiBase = ioremap(pci_resource_start(pcidev, 3),
+				     this_board->i_IorangeBase3);
 	devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);
 
 	/* Initialize parameters that can be overridden in EEPROM */