| Message ID | 1354892956-14623-1-git-send-email-holger.brunck@keymile.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 3c00433b7637fdffb0e3fabdf2f08e55b2de594d |
| Delegated to: | Kumar Gala |
| Headers | show |
On Dec 7, 2012, at 9:09 AM, Holger Brunck wrote: > Signed-off-by: Holger Brunck <holger.brunck@keymile.com> > cc: Kumar Gala <galak@kernel.crashing.org> > --- > arch/powerpc/platforms/82xx/km82xx.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) applied 1-5 to next - k
diff --git a/arch/powerpc/platforms/82xx/km82xx.c b/arch/powerpc/platforms/82xx/km82xx.c index cf964e1..058cc18 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; }
Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Kumar Gala <galak@kernel.crashing.org> --- arch/powerpc/platforms/82xx/km82xx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)