Sync with Linux 2.1.46.

1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/sbus/char/fb.h b/drivers/sbus/char/fb.h
index 029eac81b..0aa9f2b48 100644
--- a/drivers/sbus/char/fb.h
+++ b/drivers/sbus/char/fb.h
@@ -1,4 +1,4 @@
-/* $Id: fb.h,v 1.26 1997/04/17 02:29:33 miguel Exp $
+/* $Id: fb.h,v 1.29 1997/07/15 09:48:48 jj Exp $
  * fb.h: contains the definitions of the structures that various sun
  *       frame buffer can use to do console driver stuff.
  *
@@ -33,7 +33,7 @@ struct cg_cursor {
         struct  fbcurpos chot;	/* hot-spot */
         struct  fbcurpos size;	/* size of mask & image fields */
         struct	fbcurpos hwsize; /* hw max size */
-        int     bits[2][32];	/* space for mask & image bits */
+        int     bits[2][128];	/* space for mask & image bits */
 	char    color [6];	/* cursor colors */
 };
 
@@ -57,6 +57,14 @@ struct tcx_info {
 	int lowdepth;
 };
 
+struct ffb_info {
+	unsigned long physbase;
+	struct ffb_fbc *fbc;
+	struct ffb_dac *dac;
+	int dac_rev;
+	u32	*clut;
+};
+
 struct leo_info {
 	struct leo_cursor *cursor;
 	struct leo_lc_ss0_krn *lc_ss0_krn;
@@ -113,6 +121,7 @@ typedef struct fbinfo {
 		struct cg14_info  cg14;
 		struct tcx_info   tcx;
 		struct leo_info	  leo;
+		struct ffb_info   ffb;
 	} info;		        /* per frame information */
 	int    space;           /* I/O space this card resides in */
 	int    blanked;		/* true if video blanked */
@@ -183,7 +192,7 @@ extern int con_height, con_linebytes;
 extern int ints_per_line;
 
 /* used in the mmap routines */
-extern unsigned int get_phys (unsigned long addr);
+extern unsigned long get_phys (unsigned long addr);
 extern int get_iospace (unsigned long addr);
 extern void render_screen(void);