diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-24 04:00:57 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-24 04:00:57 -0400 |
| commit | 2bceec57fa7d660dffd4fbe423d84411cafb1acf (patch) | |
| tree | 77c9eec1be407fc1efa762abcea4b781410d548f /drivers | |
| parent | 291600193e5c0c3f0a9af1f23a8076dd7417c02a (diff) | |
| parent | 06c8a6a3e40265ff580428bbf51991617477f65b (diff) | |
Merge branch 'common/fbdev-meram' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x into fbdev-fixes-for-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/sh_mobile_meram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c index 9170c82b495c..cc7d7329dc15 100644 --- a/drivers/video/sh_mobile_meram.c +++ b/drivers/video/sh_mobile_meram.c | |||
| @@ -218,7 +218,7 @@ static inline void meram_get_next_icb_addr(struct sh_mobile_meram_info *pdata, | |||
| 218 | icb_offset = 0xc0000000 | (cfg->current_reg << 23); | 218 | icb_offset = 0xc0000000 | (cfg->current_reg << 23); |
| 219 | 219 | ||
| 220 | *icb_addr_y = icb_offset | (cfg->icb[0].marker_icb << 24); | 220 | *icb_addr_y = icb_offset | (cfg->icb[0].marker_icb << 24); |
| 221 | if ((*icb_addr_c) && is_nvcolor(cfg->pixelformat)) | 221 | if (is_nvcolor(cfg->pixelformat)) |
| 222 | *icb_addr_c = icb_offset | (cfg->icb[1].marker_icb << 24); | 222 | *icb_addr_c = icb_offset | (cfg->icb[1].marker_icb << 24); |
| 223 | } | 223 | } |
| 224 | 224 | ||