diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /include/video | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/fbcon.h | 1 | ||||
| -rw-r--r-- | include/video/sbusfb.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/video/fbcon.h b/include/video/fbcon.h index 4fe4eb7eb..812a2ff9b 100644 --- a/include/video/fbcon.h +++ b/include/video/fbcon.h @@ -13,6 +13,7 @@ #include <linux/config.h> #include <linux/console_struct.h> +#include <linux/vt_buffer.h> /* diff --git a/include/video/sbusfb.h b/include/video/sbusfb.h index 2a6d91215..2511cbd5f 100644 --- a/include/video/sbusfb.h +++ b/include/video/sbusfb.h @@ -15,8 +15,12 @@ struct bt_regs { struct fb_info_creator { struct ffb_fbc *fbc; struct ffb_dac *dac; - int dac_rev; int xy_margin; + int fifo_cache; + u64 yx_margin; + int fg_cache; + int bg_cache; + int dac_rev; }; struct fb_info_cgsix { struct bt_regs *bt; |