Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / sm750fb / ddk750_mode.c

diff --git a/drivers/staging/sm750fb/ddk750_mode.c b/drivers/staging/sm750fb/ddk750_mode.c
index ccb4e067661a8647b3e967cf4ac58fc1f63a3b8c..e29d4bd5dcec02f78af304553831778bab81a5b2 100644 (file)
--- a/drivers/staging/sm750fb/ddk750_mode.c
+++ b/drivers/staging/sm750fb/ddk750_mode.c
@@ -63,7 +63,7 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam,
        dispControl |= (CRT_DISPLAY_CTRL_CRTSELECT | CRT_DISPLAY_CTRL_RGBBIT);
 
        /* Set bit 14 of display controller */
-       dispControl = DISPLAY_CTRL_CLOCK_PHASE;
+       dispControl |= DISPLAY_CTRL_CLOCK_PHASE;
 
        POKE32(CRT_DISPLAY_CTRL, dispControl);