diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
| commit | e308faf24f68e262d92d294a01ddca7a17e76762 (patch) | |
| tree | 22c47cb315811834861f013067878ff664e95abd /include/linux/console_struct.h | |
| parent | 30c6397ce63178fcb3e7963ac247f0a03132aca9 (diff) | |
Sync with Linux 2.1.46.
Diffstat (limited to 'include/linux/console_struct.h')
| -rw-r--r-- | include/linux/console_struct.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index e9ef418f7..99ed0e347 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -4,6 +4,8 @@ * Data structure and defines shared between console.c, vga.c and tga.c */ +#include <linux/config.h> + #define NPAR 16 struct vc_data { @@ -17,12 +19,17 @@ struct vc_data { unsigned char vc_halfcolor; /* Colour for half intensity mode */ unsigned long vc_origin; /* Used for EGA/VGA fast scroll */ unsigned long vc_scr_end; /* Used for EGA/VGA fast scroll */ - unsigned long vc_pos; unsigned long vc_x,vc_y; unsigned long vc_top,vc_bottom; unsigned long vc_state; unsigned long vc_npar,vc_par[NPAR]; +#ifdef CONFIG_FB_CONSOLE + unsigned short *vc_video_mem_start; /* Start of video RAM */ + unsigned short *vc_pos; +#else + unsigned long vc_pos; unsigned long vc_video_mem_start; /* Start of video RAM */ +#endif unsigned long vc_video_mem_end; /* End of video RAM (sort of) */ unsigned long vc_saved_x; unsigned long vc_saved_y; |