From 7356b83f0d22d4cc7ce0207882a185bb8a1c09e8 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Tue, 8 May 2012 23:04:55 +0300
Subject: [PATCH] --- yaml --- r: 304603 b: refs/heads/master c:
 374212750b06ae2270e0e1e5843cfb33d5faf3f9 h: refs/heads/master i:   304601:
 a7308d9f93b07aaa2bb7a5dd96471dc378012c2d   304599:
 7d41d3ae6ffc6806aaa6cfe7c175177dc7b10834 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/misc/mei/main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2eadbb4c4002..511f183a7c76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14fc42355f10199f39bc38dd2d3e9288a31e770c
+refs/heads/master: 374212750b06ae2270e0e1e5843cfb33d5faf3f9
diff --git a/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c
index 20f80dfcf319..ef5e3ec40f55 100644
--- a/trunk/drivers/misc/mei/main.c
+++ b/trunk/drivers/misc/mei/main.c
@@ -1201,7 +1201,7 @@ static int __init mei_init_module(void)
 	/* init pci module */
 	ret = pci_register_driver(&mei_driver);
 	if (ret < 0)
-		printk(KERN_ERR "mei: Error registering driver.\n");
+		pr_err("error registering driver.\n");
 
 	return ret;
 }