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>

diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt
index 1822b190ccd6083cfccc61dd3e1f10ff7ff601a8..a38d3aa4d189960121ed9740fa0827773b574b91 100644 (file)
--- 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 4dd08b4af1703f55bc148c93680a83ebc4769431..04612f938bab1fc3eecf457d070fe501b8a1a3de 100644 (file)
--- 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;
                }
        }