From 780fd0b2a27f022968c2a3ad1af92d21f5331fae Mon Sep 17 00:00:00 2001
From: Holger Brunck <holger.brunck@keymile.com>
Date: Fri, 7 Dec 2012 16:09:12 +0100
Subject: [PATCH] --- yaml --- r: 356448 b: refs/heads/master c:
 3c00433b7637fdffb0e3fabdf2f08e55b2de594d h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/platforms/82xx/km82xx.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b1c18d330f7c..4ae38194d1c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14bdc9132eca0c77cb19e26f4d73328434170de7
+refs/heads/master: 3c00433b7637fdffb0e3fabdf2f08e55b2de594d
diff --git a/trunk/arch/powerpc/platforms/82xx/km82xx.c b/trunk/arch/powerpc/platforms/82xx/km82xx.c
index cf964e19573a..058cc1895c88 100644
--- a/trunk/arch/powerpc/platforms/82xx/km82xx.c
+++ b/trunk/arch/powerpc/platforms/82xx/km82xx.c
@@ -18,11 +18,11 @@
 #include <linux/fsl_devices.h>
 #include <linux/of_platform.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/cpm2.h>
 #include <asm/udbg.h>
 #include <asm/machdep.h>
-#include <asm/time.h>
+#include <linux/time.h>
 #include <asm/mpc8260.h>
 #include <asm/prom.h>
 
@@ -36,7 +36,7 @@ static void __init km82xx_pic_init(void)
 	struct device_node *np = of_find_compatible_node(NULL, NULL,
 							"fsl,pq2-pic");
 	if (!np) {
-		printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
+		pr_err("PIC init: can not find cpm-pic node\n");
 		return;
 	}