diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 05bd8f02723f..ba670db1fd37 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -28,6 +28,8 @@ | |||
28 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
31 | #include <linux/platform_data/gpio-omap.h> | ||
32 | |||
31 | #include <trace/events/power.h> | 33 | #include <trace/events/power.h> |
32 | 34 | ||
33 | #include <asm/suspend.h> | 35 | #include <asm/suspend.h> |
@@ -389,9 +391,8 @@ restore: | |||
389 | list_for_each_entry(pwrst, &pwrst_list, node) { | 391 | list_for_each_entry(pwrst, &pwrst_list, node) { |
390 | state = pwrdm_read_prev_pwrst(pwrst->pwrdm); | 392 | state = pwrdm_read_prev_pwrst(pwrst->pwrdm); |
391 | if (state > pwrst->next_state) { | 393 | if (state > pwrst->next_state) { |
392 | pr_info("Powerdomain (%s) didn't enter " | 394 | pr_info("Powerdomain (%s) didn't enter target state %d\n", |
393 | "target state %d\n", | 395 | pwrst->pwrdm->name, pwrst->next_state); |
394 | pwrst->pwrdm->name, pwrst->next_state); | ||
395 | ret = -1; | 396 | ret = -1; |
396 | } | 397 | } |
397 | omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); | 398 | omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); |
@@ -731,8 +732,7 @@ int __init omap3_pm_init(void) | |||
731 | omap3_secure_ram_storage = | 732 | omap3_secure_ram_storage = |
732 | kmalloc(0x803F, GFP_KERNEL); | 733 | kmalloc(0x803F, GFP_KERNEL); |
733 | if (!omap3_secure_ram_storage) | 734 | if (!omap3_secure_ram_storage) |
734 | pr_err("Memory allocation failed when " | 735 | pr_err("Memory allocation failed when allocating for secure sram context\n"); |
735 | "allocating for secure sram context\n"); | ||
736 | 736 | ||
737 | local_irq_disable(); | 737 | local_irq_disable(); |
738 | local_fiq_disable(); | 738 | local_fiq_disable(); |