Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdd705dd authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'fixes-v3.15-rc1'; commit... 

Merge branch 'fixes-v3.15-rc1'; commit '390403fd' into omap-for-v3.15/fixes
parents b7ab524b 390403fd

arch/arm/mach-omap2/pm34xx.c

+0 −4
Original line number Diff line number Diff line
@@ -330,10 +330,6 @@ void omap_sram_idle(void) 
			omap3_sram_restore_context();

			omap2_sms_restore_context();

		}

		if (core_next_state == PWRDM_POWER_OFF)

			omap2_prm_clear_mod_reg_bits(OMAP3430_AUTO_OFF_MASK,

					       OMAP3430_GR_MOD,

					       OMAP3_PRM_VOLTCTRL_OFFSET);

	}

	omap3_intc_resume_idle();