diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
tree | 357efc7b93f8f5102110d20d293f41360ec212fc /drivers/video/vesafb.c | |
parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) |
Merge with Linux 2.3.21.
Diffstat (limited to 'drivers/video/vesafb.c')
-rw-r--r-- | drivers/video/vesafb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index bb98bd8c7..cf4f9baa9 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -532,6 +532,8 @@ int __init vesafb_init(void) video_base = screen_info.lfb_base; video_bpp = screen_info.lfb_depth; + if (15 == video_bpp) + video_bpp = 16; video_width = screen_info.lfb_width; video_height = screen_info.lfb_height; video_linelength = screen_info.lfb_linelength; |