summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-09-25 13:27:50 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-09-25 13:27:50 +0400
commitf933b87e6f06fcce5988fd5e8ebf3a97858a7155 (patch)
treeeb334347814e930bd0fd39b2f8291655280a597c /drivers/video
parent2f27bf834e1d0a06e83d7458b535891c552271aa (diff)
parentd42028060dfe1b9b65a387a849e82fd5c86359fb (diff)
downloadlinux-f933b87e6f06fcce5988fd5e8ebf3a97858a7155.tar.xz
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/pxa168fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index 5d786bd3e304..a31a77ff6f3d 100644
--- a/drivers/video/pxa168fb.c
+++ b/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