diff options
| author | Russell King | 2010-09-25 11:27:50 +0200 |
|---|---|---|
| committer | Russell King | 2010-09-25 11:27:50 +0200 |
| commit | f933b87e6f06fcce5988fd5e8ebf3a97858a7155 (patch) | |
| tree | eb334347814e930bd0fd39b2f8291655280a597c /drivers/video | |
| parent | ARM: 6401/1: plug a race in the alignment trap handler (diff) | |
| parent | ARM: pxa: remove pr_<level> uses of KERN_<level> (diff) | |
| download | kernel-qcow2-linux-f933b87e6f06fcce5988fd5e8ebf3a97858a7155.tar.gz kernel-qcow2-linux-f933b87e6f06fcce5988fd5e8ebf3a97858a7155.tar.xz kernel-qcow2-linux-f933b87e6f06fcce5988fd5e8ebf3a97858a7155.zip | |
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.c | 4 |
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 |