---

yaml
---
r: 354324
b: refs/heads/master
c: 4172246
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb89942cb3bff23a3bf8b799ae6f255a137eb775
+refs/heads/master: 41722460b70763eea69a76b4eb743b7295dfaa62

trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c

@@ -94,9 +94,6 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	struct dio24_private *devpriv;
 	struct comedi_subdevice *s;
 	unsigned long iobase = 0;
-#ifdef incomplete
-	unsigned int irq = 0;
-#endif
 	struct pcmcia_device *link;
 	int ret;
 
@@ -112,9 +109,6 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		if (!link)
 			return -EIO;
 		iobase = link->resource[0]->start;
-#ifdef incomplete
-		irq = link->irq;
-#endif
 		break;
 	default:
 		pr_err("bug! couldn't determine board type\n");
@@ -123,10 +117,6 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	}
 	pr_debug("comedi%d: ni_daq_dio24: %s, io 0x%lx", dev->minor,
 		 thisboard->name, iobase);
-#ifdef incomplete
-	if (irq)
-		pr_debug("irq %u\n", irq);
-#endif
 
 	if (iobase == 0) {
 		pr_err("io base address is zero!\n");
@@ -135,11 +125,6 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 	dev->iobase = iobase;
 
-#ifdef incomplete
-	/* grab our IRQ */
-	dev->irq = irq;
-#endif
-
 	dev->board_name = thisboard->name;
 
 	ret = comedi_alloc_subdevices(dev, 1);