---

yaml --- r: 211067 b: refs/heads/master c: 07a5d14 h: refs/heads/master i: 211065: 9300ab4 211063: 55cf950 v: v3
git-mirror · Sep 25, 2010 · 5ab54fc · 5ab54fc
1 parent 31f9614
commit 5ab54fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfc6a554d7a364997a43964b4b1290487f890447
+refs/heads/master: 07a5d146c80b7caa9e754b51f64d3fcbbc74e9c0
diff --git a/trunk/drivers/video/pxa168fb.c b/trunk/drivers/video/pxa168fb.c
@@ -298,8 +298,8 @@ static void set_dma_control0(struct pxa168fb_info *fbi)
 	 * Set bit to enable graphics DMA.
 	 */
 	x = readl(fbi->reg_base + LCD_SPU_DMA_CTRL0);
-	x |= fbi->active ? 0x00000100 : 0;
-	fbi->active = 0;
+	x &= ~CFG_GRA_ENA_MASK;
+	x |= fbi->active ? CFG_GRA_ENA(1) : CFG_GRA_ENA(0);
 
 	/*
 	 * If we are in a pseudo-color mode, we need to enable