diff --git a/[refs] b/[refs]
index 789b81d6a35a..7dea099c35f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0d116876cc6e8ce8c2bd21d116f0c238cfe48ba
+refs/heads/master: ade6c03da5918ce25889d4a1d87453af5fbb8b9a
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h b/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
index b3035b5947db..08b32406e04f 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
@@ -201,7 +201,6 @@ struct pcilst_struct {
 	unsigned char pci_bus;
 	unsigned char pci_slot;
 	unsigned char pci_func;
-	unsigned int irq;
 };
 
 /* ptr to root list of all amcc devices */
@@ -259,8 +258,6 @@ void v_pci_card_list_init(unsigned short pci_vendor)
 				amcc->pci_bus = pcidev->bus->number;
 				amcc->pci_slot = PCI_SLOT(pcidev->devfn);
 				amcc->pci_func = PCI_FUNC(pcidev->devfn);
-				amcc->irq = pcidev->irq;
-
 			}
 		}
 	}
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 249fa9039591..ae85f64406bd 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -177,11 +177,11 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 	/* ## */
 
-	if (card->irq > 0) {
-		ret = request_irq(card->irq, v_ADDI_Interrupt, IRQF_SHARED,
+	if (pcidev->irq > 0) {
+		ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
 				  this_board->pc_DriverName, dev);
 		if (ret == 0)
-			dev->irq = card->irq;
+			dev->irq = pcidev->irq;
 	}
 
 	/*  Read eepeom and fill addi_board Structure */