Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bceec57 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'common/fbdev-meram' of... 

Merge branch 'common/fbdev-meram' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x into fbdev-fixes-for-linus
parents 29160019 06c8a6a3

drivers/video/sh_mobile_meram.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static inline void meram_get_next_icb_addr(struct sh_mobile_meram_info *pdata, 
		icb_offset = 0xc0000000 | (cfg->current_reg << 23);



	*icb_addr_y = icb_offset | (cfg->icb[0].marker_icb << 24);

	if ((*icb_addr_c) && is_nvcolor(cfg->pixelformat))

	if (is_nvcolor(cfg->pixelformat))

		*icb_addr_c = icb_offset | (cfg->icb[1].marker_icb << 24);

}