summaryrefslogtreecommitdiff
path: root/include/linux/console_struct.h
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@maxwell.earthlink.net>2002-12-08 16:37:31 -0800
committerJames Simmons <jsimmons@maxwell.earthlink.net>2002-12-08 16:37:31 -0800
commit573bcfbc1fc9e9a83afb2ce2dc24883de9ae068c (patch)
tree11ed014672f0ee3e0e239e2855df99ff6758bfcd /include/linux/console_struct.h
parent5b88c06048be434f0f5c137b2f7f353fa9c7212b (diff)
parent9c0b841c2edab11c321b878dd65144368bd2992c (diff)
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'include/linux/console_struct.h')
-rw-r--r--include/linux/console_struct.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index d86c16e96d11..153f71db1f38 100644
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -27,6 +27,7 @@ struct vc_data {
unsigned char vc_halfcolor; /* Color for half intensity mode */
unsigned short vc_complement_mask; /* [#] Xor mask for mouse pointer */
unsigned short vc_hi_font_mask; /* [#] Attribute set for upper 256 chars of font or 0 if not supported */
+ struct console_font_op vc_font; /* Current VC font set */
unsigned short vc_video_erase_char; /* Background erase character */
unsigned short vc_s_complement_mask; /* Saved mouse pointer mask */
unsigned int vc_x, vc_y; /* Cursor position */