summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Brunck <holger.brunck@keymile.com>2012-12-07 16:09:13 +0100
committerKumar Gala <galak@kernel.crashing.org>2013-02-13 07:49:05 -0600
commit89491d83b27c8a713826787e40d87a4024a2cc24 (patch)
tree95ef53cad58d36eb2fe23357fa8477997a1ea314
parent3c00433b7637fdffb0e3fabdf2f08e55b2de594d (diff)
downloadblackbird-op-linux-89491d83b27c8a713826787e40d87a4024a2cc24.tar.gz
blackbird-op-linux-89491d83b27c8a713826787e40d87a4024a2cc24.zip
powerpc/83xx: fix checkpatch warnings for km83xx.c
Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/platforms/83xx/km83xx.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
index 89923d723349..cb6460cd96e9 100644
--- a/arch/powerpc/platforms/83xx/km83xx.c
+++ b/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;
}
OpenPOWER on IntegriCloud