From 2aaa2018cea44b1d8a32f4c2a7b47cf0c51bb173 Mon Sep 17 00:00:00 2001
From: Holger Brunck <holger.brunck@keymile.com>
Date: Fri, 7 Dec 2012 16:09:13 +0100
Subject: [PATCH] --- yaml --- r: 356449 b: refs/heads/master c:
 89491d83b27c8a713826787e40d87a4024a2cc24 h: refs/heads/master i:   356447:
 c601f9944775005389e2e5ca701b8fe7879a99ac v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/powerpc/platforms/83xx/km83xx.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4ae38194d1c1..6915be0f94b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c00433b7637fdffb0e3fabdf2f08e55b2de594d
+refs/heads/master: 89491d83b27c8a713826787e40d87a4024a2cc24
diff --git a/trunk/arch/powerpc/platforms/83xx/km83xx.c b/trunk/arch/powerpc/platforms/83xx/km83xx.c
index 89923d723349..cb6460cd96e9 100644
--- a/trunk/arch/powerpc/platforms/83xx/km83xx.c
+++ b/trunk/arch/powerpc/platforms/83xx/km83xx.c
@@ -28,8 +28,8 @@
 #include <linux/of_device.h>
 
 #include <linux/atomic.h>
-#include <asm/time.h>
-#include <asm/io.h>
+#include <linux/time.h>
+#include <linux/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
 #include <asm/irq.h>
@@ -88,15 +88,13 @@ static void __init mpc83xx_km_setup_arch(void)
 
 		np_par = of_find_node_by_name(NULL, "par_io");
 		if (np_par == NULL) {
-			printk(KERN_WARNING "%s couldn;t find par_io node\n",
-				__func__);
+			pr_warn("%s couldn;t find par_io node\n", __func__);
 			return;
 		}
 		/* Map Parallel I/O ports registers */
 		ret = of_address_to_resource(np_par, 0, &res);
 		if (ret) {
-			printk(KERN_WARNING "%s couldn;t map par_io registers\n",
-				__func__);
+			pr_warn("%s couldn;t map par_io registers\n", __func__);
 			return;
 		}