summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2016-02-22 01:55:34 +0000
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-02-26 13:06:11 +0200
commite29f0d55e2b98f630d86892688a00a9d820b9989 (patch)
treeb53bcefd99da697359b86e9b379bbd890ef2cf03 /drivers/video
parent5832706e8b50bab3fce1b4bad62b356554b851e4 (diff)
downloadlinux-stable-e29f0d55e2b98f630d86892688a00a9d820b9989.tar.gz
linux-stable-e29f0d55e2b98f630d86892688a00a9d820b9989.tar.bz2
linux-stable-e29f0d55e2b98f630d86892688a00a9d820b9989.zip
video: fbdev: bt431: Correct cursor format control macro
The Bt431 cursor generator supports simultaneous generation of a 64 x 64 and a cross hair cursor in which the cursor format control bit (bit D4) of the command register "specifies whether the contents of the cursor RAM are to be logically exclusive-ORed (logical zero) or ORed (logical one) with the cross hair cursor". Rename the relevant macro accordingly. References: [1] "Bt431 Monolithic CMOS 64 x 64 Pixel Cursor Generator", Brooktree Corporation, Document Number: L431001, Rev. J Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/bt431.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/bt431.h b/drivers/video/fbdev/bt431.h
index 108fab39fd78..3929602f5867 100644
--- a/drivers/video/fbdev/bt431.h
+++ b/drivers/video/fbdev/bt431.h
@@ -63,7 +63,7 @@ static inline u8 bt431_get_value(u16 val)
#define BT431_CMD_CURS_ENABLE 0x40
#define BT431_CMD_XHAIR_ENABLE 0x20
#define BT431_CMD_OR_CURSORS 0x10
-#define BT431_CMD_AND_CURSORS 0x00
+#define BT431_CMD_XOR_CURSORS 0x00
#define BT431_CMD_1_1_MUX 0x00
#define BT431_CMD_4_1_MUX 0x04
#define BT431_CMD_5_1_MUX 0x08