diff --git a/[refs] b/[refs] index d2faba69c257..71b2ad3ae1a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efe4567c54c628f0626f98a3355aa82a45bb14c0 +refs/heads/master: 044c2e1756f3e3d5d73a7aac53d801d0242e4e56 diff --git a/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c b/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c index 601f03d5897f..14cee4960911 100644 --- a/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c +++ b/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c @@ -203,8 +203,6 @@ static int aio_aio12_8_attach(struct comedi_device *dev, int iobase; int ret; - dev->board_name = board->name; - iobase = it->options[0]; if (!request_region(iobase, 32, dev->board_name)) { printk(KERN_ERR "I/O port conflict");