diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
| commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
| tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /drivers/video/sh7760fb.c | |
| parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'drivers/video/sh7760fb.c')
| -rw-r--r-- | drivers/video/sh7760fb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c index 4d0e28c5790b..8d0212da4514 100644 --- a/drivers/video/sh7760fb.c +++ b/drivers/video/sh7760fb.c | |||
| @@ -152,6 +152,7 @@ static int sh7760fb_setcmap(struct fb_cmap *cmap, struct fb_info *info) | |||
| 152 | col |= ((*g) & 0xff) << 8; | 152 | col |= ((*g) & 0xff) << 8; |
| 153 | col |= ((*b) & 0xff); | 153 | col |= ((*b) & 0xff); |
| 154 | col &= SH7760FB_PALETTE_MASK; | 154 | col &= SH7760FB_PALETTE_MASK; |
| 155 | iowrite32(col, par->base + LDPR(s)); | ||
| 155 | 156 | ||
| 156 | if (s < 16) | 157 | if (s < 16) |
| 157 | ((u32 *) (info->pseudo_palette))[s] = s; | 158 | ((u32 *) (info->pseudo_palette))[s] = s; |