summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/powerdomains44xx.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-09-27 13:17:13 -0700
committerTony Lindgren <tony@atomide.com>2010-09-27 13:17:13 -0700
commit91f6c90c8df1818a66d177e105d602c3da820919 (patch)
tree5cb1b01823dd676a07596f6153d2fc124c4691cb /arch/arm/mach-omap2/powerdomains44xx.h
parent6e457bb05c348e196f67005876992ceb5eb0430a (diff)
parenta3fed9bc181666df6ecfe9ce34a29d48803f2310 (diff)
downloadblackbird-obmc-linux-91f6c90c8df1818a66d177e105d602c3da820919.tar.gz
blackbird-obmc-linux-91f6c90c8df1818a66d177e105d602c3da820919.zip
Merge branch 'omap4_and_sdrc_2.6.27' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/powerdomains44xx.h')
-rw-r--r--arch/arm/mach-omap2/powerdomains44xx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/powerdomains44xx.h b/arch/arm/mach-omap2/powerdomains44xx.h
index c7219513472a..9c01b55d6102 100644
--- a/arch/arm/mach-omap2/powerdomains44xx.h
+++ b/arch/arm/mach-omap2/powerdomains44xx.h
@@ -98,7 +98,7 @@ static struct powerdomain dss_44xx_pwrdm = {
.prcm_offs = OMAP4430_PRM_DSS_MOD,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
.pwrsts = PWRSTS_OFF_RET_ON,
- .pwrsts_logic_ret = PWRSTS_OFF_RET,
+ .pwrsts_logic_ret = PWRSTS_OFF,
.banks = 1,
.pwrsts_mem_ret = {
[0] = PWRDM_POWER_OFF, /* dss_mem */
OpenPOWER on IntegriCloud