summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-08-04 13:08:05 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-08-04 13:08:05 +0200
commit5df112cd75b9cf85a5a976f847bdcba4020c2dcd (patch)
tree39efe0fa62e2f47978eabf5fa6004a00ed330819
parent4dd83942b418b937e3da02746baabf63f37fe682 (diff)
The whole rounding stuff really depends on a specific resolution. This reverts commit 4dd83942b418b937e3da02746baabf63f37fe682.
-rw-r--r--drivers/video/console/fbcon.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index cff5ea5..8745637 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -633,11 +633,6 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
kfree(save);
}
-#ifdef CONFIG_LOGO_CUSTOM_CLUT224
- /* workaround full screen custom boot logo issue */
- logo_lines = logo_lines - 1;
-#endif /* CONFIG_LOGO_CUSTOM_CLUT224 */
-
if (logo_lines > vc->vc_bottom) {
logo_shown = FBCON_LOGO_CANSHOW;
printk(KERN_INFO
@@ -1293,11 +1288,6 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
int y;
int c = scr_readw((u16 *) vc->vc_pos);
-#ifdef CONFIG_LOGO_CUSTOM_CLUT224
- /* disable cursor for custom boot logo */
- vc->vc_deccm = 0;
-#endif /* CONFIG_LOGO_CUSTOM_CLUT224 */
-
if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
return;