diff options
author | Tony Lindgren <tony@atomide.com> | 2010-01-29 11:37:48 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-01-29 11:37:48 -0800 |
commit | 9ba874506b7b3883d78b8cad61eba39c4bb09885 (patch) | |
tree | 8e2112bea42e5cca4f8394274309e30f83b55fc1 /arch/arm/mach-omap2/sleep34xx.S | |
parent | 4f4e65d2484811210a2826fa9d59712c7fcf1b49 (diff) | |
parent | 98fa3d8aeabf7a039cc920a9c2ffebc6b4648e2b (diff) | |
download | kernel_samsung_smdk4412-9ba874506b7b3883d78b8cad61eba39c4bb09885.tar.gz kernel_samsung_smdk4412-9ba874506b7b3883d78b8cad61eba39c4bb09885.tar.bz2 kernel_samsung_smdk4412-9ba874506b7b3883d78b8cad61eba39c4bb09885.zip |
Merge branch 'for_2.6.34_4f4e65_a' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/sleep34xx.S')
-rw-r--r-- | arch/arm/mach-omap2/sleep34xx.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S index c3626ea4814..22fcc14e63b 100644 --- a/arch/arm/mach-omap2/sleep34xx.S +++ b/arch/arm/mach-omap2/sleep34xx.S @@ -38,7 +38,7 @@ #define PM_PREPWSTST_CORE_P 0x48306AE8 #define PM_PREPWSTST_MPU_V OMAP34XX_PRM_REGADDR(MPU_MOD, \ OMAP3430_PM_PREPWSTST) -#define PM_PWSTCTRL_MPU_P OMAP3430_PRM_BASE + MPU_MOD + PM_PWSTCTRL +#define PM_PWSTCTRL_MPU_P OMAP3430_PRM_BASE + MPU_MOD + OMAP2_PM_PWSTCTRL #define CM_IDLEST1_CORE_V OMAP34XX_CM_REGADDR(CORE_MOD, CM_IDLEST1) #define SRAM_BASE_P 0x40200000 #define CONTROL_STAT 0x480022F0 |