From 3098caf4dd85ae998c080cc0b0573c5ef8c70f21 Mon Sep 17 00:00:00 2001 From: Robert Tivy Date: Thu, 10 Jan 2013 16:23:21 -0800 Subject: [PATCH] --- yaml --- r: 355511 b: refs/heads/master c: 35031f9df569913ac0c46b03c8033fc1deed749d h: refs/heads/master i: 355509: aa4657a84b5ee861968bf6d175e63fc1a41e2d7e 355507: 35e836834ead8764fa9faec8fd27f8c456772244 355503: de284083666a483db01ae2708622822fb7cc184f v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/psc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c96117855695..e4fd5ea3dd0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2e0c18a9751229b31bf9bc7a5c1b9ab4a7a9651 +refs/heads/master: 35031f9df569913ac0c46b03c8033fc1deed749d diff --git a/trunk/arch/arm/mach-davinci/psc.c b/trunk/arch/arm/mach-davinci/psc.c index d7e210f4b55c..bddaba9628e1 100644 --- a/trunk/arch/arm/mach-davinci/psc.c +++ b/trunk/arch/arm/mach-davinci/psc.c @@ -35,7 +35,7 @@ int __init davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id) struct davinci_soc_info *soc_info = &davinci_soc_info; if (!soc_info->psc_bases || (ctlr >= soc_info->psc_bases_num)) { - pr_warning("PSC: Bad psc data: 0x%x[%d]\n", + pr_warn("PSC: Bad psc data: 0x%x[%d]\n", (int)soc_info->psc_bases, ctlr); return 0; } @@ -58,7 +58,7 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr, u32 next_state = PSC_STATE_ENABLE; if (!soc_info->psc_bases || (ctlr >= soc_info->psc_bases_num)) { - pr_warning("PSC: Bad psc data: 0x%x[%d]\n", + pr_warn("PSC: Bad psc data: 0x%x[%d]\n", (int)soc_info->psc_bases, ctlr); return; }