Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / drivers / staging / comedi / drivers / aio_aio12_8.c

diff --git a/drivers/staging/comedi/drivers/aio_aio12_8.c b/drivers/staging/comedi/drivers/aio_aio12_8.c
index c4cac66db12ea859f6a4efeb3b7d0ea5370cf3c1..7a1c636df5be11720c765503f320a5e8f5c907c8 100644 (file)
--- a/drivers/staging/comedi/drivers/aio_aio12_8.c
+++ b/drivers/staging/comedi/drivers/aio_aio12_8.c
@@ -110,7 +110,7 @@ static int aio_aio12_8_ai_read(struct comedi_device *dev,
                while (timeout &&
                       !(inb(dev->iobase + AIO12_8_STATUS) & STATUS_ADC_EOC)) {
                        timeout--;
-                       printk("timeout %d\n", timeout);
+                       printk(KERN_ERR "timeout %d\n", timeout);
                        udelay(1);
                }
                if (timeout == 0) {
@@ -172,7 +172,7 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
 
        iobase = it->options[0];
        if (!request_region(iobase, 24, "aio_aio12_8")) {
-               printk("I/O port conflict");
+               printk(KERN_ERR "I/O port conflict");
                return -EIO;
        }