summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHolger Brunck <holger.brunck@keymile.com>2012-12-07 19:09:12 +0400
committerKumar Gala <galak@kernel.crashing.org>2013-02-13 17:49:04 +0400
commit3c00433b7637fdffb0e3fabdf2f08e55b2de594d (patch)
treea9266859d818fb7e476accb896c33d365b38ada7 /arch
parent14bdc9132eca0c77cb19e26f4d73328434170de7 (diff)
downloadlinux-3c00433b7637fdffb0e3fabdf2f08e55b2de594d.tar.xz
powerpc/82xx: fix checkpatch warnings for km82xx.c
Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/82xx/km82xx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/82xx/km82xx.c b/arch/powerpc/platforms/82xx/km82xx.c
index cf964e19573a..058cc1895c88 100644
--- a/arch/powerpc/platforms/82xx/km82xx.c
+++ b/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;
}