---

yaml --- r: 326496 b: refs/heads/master c: b61968e h: refs/heads/master v: v3
git-mirror · Sep 10, 2012 · a84836c · a84836c
1 parent 554e21e
commit a84836c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e54adb1e79762d3591459e5b0e9b9ff578e33fdb
+refs/heads/master: b61968e5cfbc511cefb7567e2d3e2fb722b35c61
diff --git a/trunk/arch/arm/mach-omap2/pm24xx.c b/trunk/arch/arm/mach-omap2/pm24xx.c
@@ -352,16 +352,6 @@ int __init omap2_pm_init(void)
 
 	prcm_setup_regs();
 
-	/* Hack to prevent MPU retention when STI console is enabled. */
-	{
-		const struct omap_sti_console_config *sti;
-
-		sti = omap_get_config(OMAP_TAG_STI_CONSOLE,
-				      struct omap_sti_console_config);
-		if (sti != NULL && sti->enable)
-			sti_console_enabled = 1;
-	}
-
 	/*
 	 * We copy the assembler sleep/wakeup routines to SRAM.
 	 * These routines need to be in SRAM as that's the only