aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear3xx/spear300.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-spear3xx/spear300.c')
-rw-r--r--arch/arm/mach-spear3xx/spear300.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index f7db66812abb..adee72bb68ec 100644
--- a/arch/arm/mach-spear3xx/spear300.c
+++ b/arch/arm/mach-spear3xx/spear300.c
@@ -11,6 +11,8 @@
11 * warranty of any kind, whether express or implied. 11 * warranty of any kind, whether express or implied.
12 */ 12 */
13 13
14#define pr_fmt(fmt) "SPEAr300: " fmt
15
14#include <linux/types.h> 16#include <linux/types.h>
15#include <linux/amba/pl061.h> 17#include <linux/amba/pl061.h>
16#include <linux/ptrace.h> 18#include <linux/ptrace.h>
@@ -447,7 +449,7 @@ void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
447 if (shirq_ras1.regs.base) { 449 if (shirq_ras1.regs.base) {
448 ret = spear_shirq_register(&shirq_ras1); 450 ret = spear_shirq_register(&shirq_ras1);
449 if (ret) 451 if (ret)
450 printk(KERN_ERR "Error registering Shared IRQ\n"); 452 pr_err("Error registering Shared IRQ\n");
451 } 453 }
452 454
453 /* pmx initialization */ 455 /* pmx initialization */
@@ -459,8 +461,8 @@ void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
459 if (pmx_driver.base) { 461 if (pmx_driver.base) {
460 ret = pmx_register(&pmx_driver); 462 ret = pmx_register(&pmx_driver);
461 if (ret) 463 if (ret)
462 printk(KERN_ERR "padmux: registration failed. err no" 464 pr_err("padmux: registration failed. err no: %d\n",
463 ": %d\n", ret); 465 ret);
464 /* Free Mapping, device selection already done */ 466 /* Free Mapping, device selection already done */
465 iounmap(pmx_driver.base); 467 iounmap(pmx_driver.base);
466 } 468 }