diff --git a/[refs] b/[refs]
index 20048fbaaba0..abfd61925173 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbae4575661da840353f12dd76499ad587c92519
+refs/heads/master: bfcded4656c09a60c836c6be566ae501adf15a50
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
index e9a4b43fda71..3140880948e1 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -84,23 +84,6 @@ static int i_ADDI_Reset(struct comedi_device *dev)
 	return 0;
 }
 
-static const void *addi_find_boardinfo(struct comedi_device *dev,
-				       struct pci_dev *pcidev)
-{
-	const void *p = dev->driver->board_name;
-	const struct addi_board *this_board;
-	int i;
-
-	for (i = 0; i < dev->driver->num_names; i++) {
-		this_board = p;
-		if (this_board->i_VendorId == pcidev->vendor &&
-		    this_board->i_DeviceId == pcidev->device)
-			return this_board;
-		p += dev->driver->offset;
-	}
-	return NULL;
-}
-
 static int addi_auto_attach(struct comedi_device *dev,
 				      unsigned long context_unused)
 {
@@ -111,13 +94,6 @@ static int addi_auto_attach(struct comedi_device *dev,
 	int ret, n_subdevices;
 	unsigned int dw_Dummy;
 
-	if (!this_board) {
-		/* The driver did not set the board_ptr, try finding it. */
-		this_board = addi_find_boardinfo(dev, pcidev);
-		if (!this_board)
-			return -ENODEV;
-		dev->board_ptr = this_board;
-	}
 	dev->board_name = this_board->pc_DriverName;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);