From ed0f131ff7a967be1b3dfc37a5fe5c7c49e61ac2 Mon Sep 17 00:00:00 2001
From: Maurice Dawson <mauricedawson2699@googlemail.com>
Date: Thu, 8 Apr 2010 13:13:20 +0100
Subject: [PATCH] --- yaml --- r: 196911 b: refs/heads/master c:
 24d2d8be91e83d6eb40240180da46b3dbd440dd5 h: refs/heads/master i:   196909:
 e3f01a67dc40bcc0f69ab5b6f9a4288bb6384a20   196907:
 8504c7ef40bbb9aff82ef88a4028a6bd3ae3ab9d   196903:
 6a98f6874b223ad6f1d2b5bb9213ca36673f9dd7   196895:
 bf1bbcdbe89ec68a46f120809f7ff606eec2cff8 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/comedi/drivers/aio_aio12_8.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 020b11168af4..39670d486dc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af6ddd57f2e811561ca57a98b4c7a2bb1db6a270
+refs/heads/master: 24d2d8be91e83d6eb40240180da46b3dbd440dd5
diff --git a/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c b/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c
index c4cac66db12e..7a1c636df5be 100644
--- a/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c
+++ b/trunk/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;
 	}