diff --git a/[refs] b/[refs] index 7014dd63e15a..9d41b0d10c2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fa68eae9f8291a98bfe00b94b78f72eb253165a +refs/heads/master: c5eb5c1ea919f3f717236c5d0892f9c37f19de37 diff --git a/trunk/drivers/video/console/bitblit.c b/trunk/drivers/video/console/bitblit.c index 12eaf0aa87e6..6550875ef9c5 100644 --- a/trunk/drivers/video/console/bitblit.c +++ b/trunk/drivers/video/console/bitblit.c @@ -114,7 +114,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info, unsigned int scan_align = info->pixmap.scan_align - 1; unsigned int buf_align = info->pixmap.buf_align - 1; unsigned int shift_low = 0, mod = vc->vc_font.width % 8; - unsigned int shift_high = 8, pitch, cnt, size, k; + unsigned int shift_high = 8, pitch, cnt, size, i, k; unsigned int idx = vc->vc_font.width >> 3; unsigned int attribute = get_attribute(info, scr_readw(s)); struct fb_image image; @@ -175,7 +175,11 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info, src = buf; } - fb_pad_aligned_buffer(dst, pitch, src, idx, image.height); + if (idx == 1) + for(i=0; i < image.height; i++) + dst[pitch*i] = src[i]; + else + fb_pad_aligned_buffer(dst, pitch, src, idx, image.height); dst += width; } }