From fccb0a3b2222a2ba068ce312a82f8b3e36bf6810 Mon Sep 17 00:00:00 2001
From: Mandeep Singh Baines <msb@chromium.org>
Date: Mon, 31 Jan 2011 11:07:14 +0100
Subject: [PATCH] --- yaml --- r: 235140 b: refs/heads/master c:
 0295a34d61f14522fddb26856191520d2e1d7e77 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/base/power/trace.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7f53152cd660..aeb812bc0dba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 790c7885a4b2105e41f7a80b035fdb78e406154f
+refs/heads/master: 0295a34d61f14522fddb26856191520d2e1d7e77
diff --git a/trunk/drivers/base/power/trace.c b/trunk/drivers/base/power/trace.c
index 9f4258df4cfd..c80e138b62fe 100644
--- a/trunk/drivers/base/power/trace.c
+++ b/trunk/drivers/base/power/trace.c
@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void)
 	unsigned int val;
 
 	get_rtc_time(&time);
-	printk("Time: %2d:%02d:%02d  Date: %02d/%02d/%02d\n",
+	pr_info("Time: %2d:%02d:%02d  Date: %02d/%02d/%02d\n",
 		time.tm_hour, time.tm_min, time.tm_sec,
 		time.tm_mon + 1, time.tm_mday, time.tm_year % 100);
 	val = time.tm_year;				/* 100 years */
@@ -179,7 +179,7 @@ static int show_file_hash(unsigned int value)
 		unsigned int hash = hash_string(lineno, file, FILEHASH);
 		if (hash != value)
 			continue;
-		printk("  hash matches %s:%u\n", file, lineno);
+		pr_info("  hash matches %s:%u\n", file, lineno);
 		match++;
 	}
 	return match;
@@ -255,7 +255,7 @@ static int late_resume_init(void)
 	val = val / FILEHASH;
 	dev = val /* % DEVHASH */;
 
-	printk("  Magic number: %d:%d:%d\n", user, file, dev);
+	pr_info("  Magic number: %d:%d:%d\n", user, file, dev);
 	show_file_hash(file);
 	show_dev_hash(dev);
 	return 0;