diff --git a/[refs] b/[refs] index 2c0248126a3e..5afe65ced9a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db6de3675375b6738fa13bb92118ec56efcb7ac3 +refs/heads/master: b329827d469fc78fe464683ac38fef07735de7b0 diff --git a/trunk/drivers/staging/comedi/drivers/acl7225b.c b/trunk/drivers/staging/comedi/drivers/acl7225b.c index adbe580fa1f6..132e26861f15 100644 --- a/trunk/drivers/staging/comedi/drivers/acl7225b.c +++ b/trunk/drivers/staging/comedi/drivers/acl7225b.c @@ -76,7 +76,6 @@ static int acl7225b_attach(struct comedi_device *dev, if (!request_region(iobase, board->io_range, dev->board_name)) return -EIO; dev->iobase = iobase; - dev->irq = 0; ret = comedi_alloc_subdevices(dev, 3); if (ret)