diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 8 | 
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 90480f75997..ba670db1fd3 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -391,9 +391,8 @@ restore:  	list_for_each_entry(pwrst, &pwrst_list, node) {  		state = pwrdm_read_prev_pwrst(pwrst->pwrdm);  		if (state > pwrst->next_state) { -			pr_info("Powerdomain (%s) didn't enter " -				"target state %d\n", -			       pwrst->pwrdm->name, pwrst->next_state); +			pr_info("Powerdomain (%s) didn't enter target state %d\n", +				pwrst->pwrdm->name, pwrst->next_state);  			ret = -1;  		}  		omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); @@ -733,8 +732,7 @@ int __init omap3_pm_init(void)  		omap3_secure_ram_storage =  			kmalloc(0x803F, GFP_KERNEL);  		if (!omap3_secure_ram_storage) -			pr_err("Memory allocation failed when " -			       "allocating for secure sram context\n"); +			pr_err("Memory allocation failed when allocating for secure sram context\n");  		local_irq_disable();  		local_fiq_disable();  |