From 54bbb1213986b1d4855e65d02d5d2605c46c096b Mon Sep 17 00:00:00 2001 From: Klaas van Gend Date: Thu, 22 Oct 2009 07:51:00 +0200 Subject: [PATCH] --- yaml --- r: 175095 b: refs/heads/master c: c5dba43b6056e83de5d95e4e17c34ad7a479aaa7 h: refs/heads/master i: 175093: 64d32d7711976457ced4500d957fe07fb03cbf22 175091: 15cd8747d75e2d126e995b8f50d0a0a388b00263 175087: 181285a966861981681ef58fb3cc5baf50068835 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/multiq3.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c590bd4fe94f..92fa5735d1e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 446176a7430f4dc311cda2200cd94336acbd0a6e +refs/heads/master: c5dba43b6056e83de5d95e4e17c34ad7a479aaa7 diff --git a/trunk/drivers/staging/comedi/drivers/multiq3.c b/trunk/drivers/staging/comedi/drivers/multiq3.c index 3aa9f23d344c..6b22f0f8f06a 100644 --- a/trunk/drivers/staging/comedi/drivers/multiq3.c +++ b/trunk/drivers/staging/comedi/drivers/multiq3.c @@ -252,9 +252,9 @@ static int multiq3_attach(struct comedi_device *dev, struct comedi_subdevice *s; iobase = it->options[0]; - printk("comedi%d: multiq3: 0x%04lx ", dev->minor, iobase); + printk(KERN_INFO "comedi%d: multiq3: 0x%04lx ", dev->minor, iobase); if (!request_region(iobase, MULTIQ3_SIZE, "multiq3")) { - printk("comedi%d: I/O port conflict\n", dev->minor); + printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor); return -EIO; } @@ -262,9 +262,10 @@ static int multiq3_attach(struct comedi_device *dev, irq = it->options[1]; if (irq) - printk("comedi%d: irq = %u ignored\n", dev->minor, irq); + printk(KERN_WARNING "comedi%d: irq = %u ignored\n", + dev->minor, irq); else - printk("comedi%d: no irq\n", dev->minor); + printk(KERN_WARNING "comedi%d: no irq\n", dev->minor); dev->board_name = "multiq3"; result = alloc_subdevices(dev, 5); if (result < 0) @@ -328,7 +329,7 @@ static int multiq3_attach(struct comedi_device *dev, static int multiq3_detach(struct comedi_device *dev) { - printk("comedi%d: multiq3: remove\n", dev->minor); + printk(KERN_INFO "comedi%d: multiq3: remove\n", dev->minor); if (dev->iobase) release_region(dev->iobase, MULTIQ3_SIZE);