summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lechner <david@lechnology.com>2017-09-04 16:00:49 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-09-04 16:00:49 +0200
commit176780c7d2fab4ac7b46f217e20db0ce533f27f4 (patch)
tree125cdaae6202b52f8a070013a5452602f0345476
parentbf4392bac1f559397285b3c285b85dd0330f3d43 (diff)
downloadlinux-stable-176780c7d2fab4ac7b46f217e20db0ce533f27f4.tar.gz
linux-stable-176780c7d2fab4ac7b46f217e20db0ce533f27f4.tar.bz2
linux-stable-176780c7d2fab4ac7b46f217e20db0ce533f27f4.zip
fbcon: remove restriction on margin color
This removes the restriction on the value range of the fbcon=margin: parameter. The color value really depends on the driver being used. Signed-off-by: David Lechner <david@lechnology.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> [b.zolnierkie: ported over fbcon changes] Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-rw-r--r--Documentation/fb/fbcon.txt2
-rw-r--r--drivers/video/fbdev/core/fbcon.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt
index 1822b190ccd6..a38d3aa4d189 100644
--- a/Documentation/fb/fbcon.txt
+++ b/Documentation/fb/fbcon.txt
@@ -153,7 +153,7 @@ C. Boot options
This option specifies the color of the margins. The margins are the
leftover area at the right and the bottom of the screen that are not
used by text. By default, this area will be black. The 'color' value
- is 0 to 7 where 0 is black and 7 is white.
+ is an integer number that depends on the framebuffer driver being used.
C. Attaching, Detaching and Unloading
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 4dd08b4af170..04612f938bab 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -498,8 +498,6 @@ static int __init fb_console_setup(char *this_opt)
options += 7;
if (*options)
margin_color = simple_strtoul(options, &options, 0);
- if (margin_color > 7)
- margin_color = 0;
continue;
}
}