summaryrefslogtreecommitdiff
path: root/include/linux/console_struct.h
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@kozmo.(none)>2002-12-05 21:18:32 -0800
committerJames Simmons <jsimmons@kozmo.(none)>2002-12-05 21:18:32 -0800
commit0d7b12a6eb028d0b46488c6265dd8f1782fa23e6 (patch)
tree03a4614917903414657d003415278e85380a8448 /include/linux/console_struct.h
parent942abc308abd0f4b33c06b04b66ec34a1e0ca5b3 (diff)
parent4737042c775ee87775d774a0918eb0107ecd3425 (diff)
Merge kozmo.(none):/usr/src/linus-2.5
into kozmo.(none):/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 */