summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2008-08-11 19:29:11 +0200
committerLinus Torvalds2008-08-11 19:29:11 +0200
commit3838f59fc2ea9821f3ea13adb555bfc6ea43c74c (patch)
treeaac8dfd1dc0a410d1e4b06d25f9c7d49019ceee9
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff)
downloadkernel-qcow2-linux-3838f59fc2ea9821f3ea13adb555bfc6ea43c74c.tar.gz
kernel-qcow2-linux-3838f59fc2ea9821f3ea13adb555bfc6ea43c74c.tar.xz
kernel-qcow2-linux-3838f59fc2ea9821f3ea13adb555bfc6ea43c74c.zip
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 <pavel@suse.cz> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Krzysztof Helt <krzysztof.h1@poczta.fm> Cc: Antonino A. Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/console/fbcon.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index de1b1365279b..a6e38e9ea73f 100644
--- 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) \