diff options
author | Harald Welte <laforge@gnumonks.org> | 2009-09-22 19:47:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:53 -0400 |
commit | 0306ab11c396f93056009152464ff104e4721817 (patch) | |
tree | b4b2586011d0b2669a2c02897795aacdb74d31d8 /drivers/video/via/viafbdev.c | |
parent | 5ff32f69e75deca5ee1a2f421ca8a3e43cfaa339 (diff) |
viafb: add support for the VX855 chipset
Add support for a new VIA integrated graphics chipset, the VX855.
Signed-off-by: HaraldWelte <HaraldWelte@viatech.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/via/viafbdev.c')
-rw-r--r-- | drivers/video/via/viafbdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 61e652cb2138..3815a9b07195 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c | |||
@@ -914,7 +914,8 @@ static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor) | |||
914 | fg_color = cursor->image.fg_color; | 914 | fg_color = cursor->image.fg_color; |
915 | bg_color = cursor->image.bg_color; | 915 | bg_color = cursor->image.bg_color; |
916 | if (chip_name == UNICHROME_CX700 || | 916 | if (chip_name == UNICHROME_CX700 || |
917 | chip_name == UNICHROME_VX800) { | 917 | chip_name == UNICHROME_VX800 || |
918 | chip_name == UNICHROME_VX855) { | ||
918 | fg_color = | 919 | fg_color = |
919 | ((info->cmap.red[fg_color] & 0xFFC0) << 14) | | 920 | ((info->cmap.red[fg_color] & 0xFFC0) << 14) | |
920 | ((info->cmap.green[fg_color] & 0xFFC0) << 4) | | 921 | ((info->cmap.green[fg_color] & 0xFFC0) << 4) | |