---

yaml --- r: 186502 b: refs/heads/master c: fcc55b3 h: refs/heads/master v: v3
git-mirror · Mar 4, 2010 · 8a71be9 · 8a71be9
1 parent 7fc9759
commit 8a71be9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71a74bd951dd292dcda623539fa7b45005d72436
+refs/heads/master: fcc55b309fc0d037b5d435712cf70589c6a0c7be
diff --git a/trunk/drivers/staging/comedi/drivers/pcmad.c b/trunk/drivers/staging/comedi/drivers/pcmad.c
@@ -134,11 +134,12 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	unsigned long iobase;
 
 	iobase = it->options[0];
-	printk("comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
+	printk(KERN_NOTICE "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
 	if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {
-		printk("I/O port conflict\n");
+		printk(KERN_CONT "I/O port conflict\n");
 		return -EIO;
 	}
+	printk(KERN_CONT "\n");
 	dev->iobase = iobase;
 
 	ret = alloc_subdevices(dev, 1);
@@ -165,7 +166,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static int pcmad_detach(struct comedi_device *dev)
 {
-	printk("comedi%d: pcmad: remove\n", dev->minor);
+	printk(KERN_NOTICE "comedi%d: pcmad: remove\n", dev->minor);
 
 	if (dev->irq)
 		free_irq(dev->irq, dev);