diff --git a/[refs] b/[refs] index a6ff99f69622..dc05efe19e57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cf05ddb0d7c5612ee70f250f22427462d820fe1 +refs/heads/master: 53fa8c46881a5a500fdcc4cf86359d92211b1e9b diff --git a/trunk/drivers/staging/comedi/drivers/ssv_dnp.c b/trunk/drivers/staging/comedi/drivers/ssv_dnp.c index 84b9f2a4280b..d1f5118c3afa 100644 --- a/trunk/drivers/staging/comedi/drivers/ssv_dnp.c +++ b/trunk/drivers/staging/comedi/drivers/ssv_dnp.c @@ -177,8 +177,6 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it) struct comedi_subdevice *s; int ret; - printk(KERN_INFO "comedi%d: dnp: ", dev->minor); - dev->board_name = board->name; ret = comedi_alloc_subdevices(dev, 1); @@ -195,8 +193,6 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_bits = dnp_dio_insn_bits; s->insn_config = dnp_dio_insn_config; - printk("attached\n"); - /* We use the I/O ports 0x22,0x23 and 0xa3-0xa9, which are always * allocated for the primary 8259, so we don't need to allocate them * ourselves. */ @@ -209,6 +205,7 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it) outb(PCMR, CSCIR); outb((inb(CSCDR) & 0xAA), CSCDR); + dev_info(dev->class_dev, "%s: attached\n", dev->board_name); return 1; }