diff --git a/[refs] b/[refs]
index cfe3deffe876..a2fd1e587dbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1aa301e83b275c9493ea232d1cb1a7edccc40c14
+refs/heads/master: 327ffc0ce7230872a7944b92961e718030ffca31
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 832a5178b638..ff3840544dd4 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -145,7 +145,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		irq = link->irq;
 		break;
 	default:
-		printk("bug! couldn't determine board type\n");
+		pr_err("bug! couldn't determine board type\n");
 		return -EINVAL;
 		break;
 	}