Merge branch 'for-linus' of git://neil.brown.name/md

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / control.c

diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 43f8a33655d4cde06a64f0be579e4e7adfa2dddb..a8d20eef2306e8ddb558f96b2cc0ceeb6a542b25 100644 (file)
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -194,11 +194,12 @@ void omap3_clear_scratchpad_contents(void)
        u32 offset = 0;
        v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);
        if (prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) &
-               OMAP3430_GLOBAL_COLD_RST) {
+           OMAP3430_GLOBAL_COLD_RST_MASK) {
                for ( ; offset <= max_offset; offset += 0x4)
                        __raw_writel(0x0, (v_addr + offset));
-               prm_set_mod_reg_bits(OMAP3430_GLOBAL_COLD_RST, OMAP3430_GR_MOD,
-                       OMAP3_PRM_RSTST_OFFSET);
+               prm_set_mod_reg_bits(OMAP3430_GLOBAL_COLD_RST_MASK,
+                                    OMAP3430_GR_MOD,
+                                    OMAP3_PRM_RSTST_OFFSET);
        }
 }