Revert "fbcon: bgcolor fix"

This reverts commit 2d04a4a72d7e1519b4838f24bdd4b5d0f3f426dc, which made
it impossible to make the softcursor use the highlight colors.

Yes, the fourth bit should be "blinking", but since we cannot reasonably
blink in fbcon, highlighting it with a bright background is preferable.

Reported-by: Pavel Machek <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Krzysztof Helt <[email protected]>
Cc: Antonino A. Daplas <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index de1b1365279b90dcafc6dd34ab804e7b7d33ab49..a6e38e9ea73f59e3b65e7f979c9481f8004c1fc0 100644 (file)
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -92,7 +92,7 @@ struct fbcon_ops {
 #define attr_fgcol(fgshift,s)    \
        (((s) >> (fgshift)) & 0x0f)
 #define attr_bgcol(bgshift,s)    \
-       (((s) >> (bgshift)) & 0x07)
+       (((s) >> (bgshift)) & 0x0f)
 
 /* Monochrome */
 #define attr_bold(s) \