Removed all old fbgen code. Small cleanups.

1 files changed, 2 insertions, 56 deletions

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 19068818681f..0340aa886918 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -304,7 +304,6 @@ extern int GET_FB_IDX(kdev_t rdev);
 #include <linux/devfs_fs_kernel.h>
 
 struct fb_info;
-struct fb_info_gen;
 struct vm_area_struct;
 struct file;
 
@@ -397,66 +396,20 @@ struct fb_info {
 #endif
 
     /*
-     *  This structure abstracts from the underlying hardware. It is not
-     *  mandatory but used by the `generic' frame buffer operations.
-     *  Read drivers/video/skeletonfb.c for more information.
-     */
-
-struct fbgen_hwswitch {
-    void (*detect)(void);
-    int (*encode_fix)(struct fb_fix_screeninfo *fix, const void *par,
-		      struct fb_info_gen *info);
-    int (*decode_var)(const struct fb_var_screeninfo *var, void *par,
-		      struct fb_info_gen *info);
-    int (*encode_var)(struct fb_var_screeninfo *var, const void *par,
-		      struct fb_info_gen *info);
-    void (*get_par)(void *par, struct fb_info_gen *info);
-    void (*set_par)(const void *par, struct fb_info_gen *info);
-    int (*getcolreg)(unsigned regno, unsigned *red, unsigned *green,
-		     unsigned *blue, unsigned *transp, struct fb_info *info);
-    int (*pan_display)(const struct fb_var_screeninfo *var,
-		       struct fb_info_gen *info);
-    int (*blank)(int blank_mode, struct fb_info_gen *info);
-    void (*set_disp)(const void *par, struct display *disp,
-		     struct fb_info_gen *info);
-};
-
-struct fb_info_gen {
-    struct fb_info info;
-
-    /* Entries for a generic frame buffer device */
-    /* Yes, this starts looking like C++ */
-    u_int parsize;
-    struct fbgen_hwswitch *fbhw;
-
-   /* From here on everything is device dependent */
-};
-
-    /*
      *  `Generic' versions of the frame buffer device operations
      */
 
-extern int fbgen_get_fix(struct fb_fix_screeninfo *fix, int con,
-			 struct fb_info *info);
 extern int gen_get_fix(struct fb_fix_screeninfo *fix, int con,
 		       struct fb_info *info);
-extern int fbgen_get_var(struct fb_var_screeninfo *var, int con,
-			 struct fb_info *info);
 extern int gen_get_var(struct fb_var_screeninfo *var, int con,
 		       struct fb_info *info);
-extern int fbgen_set_var(struct fb_var_screeninfo *var, int con,
-			 struct fb_info *info);
 extern int gen_set_var(struct fb_var_screeninfo *var, int con,
 		       struct fb_info *info);
-extern int fbgen_get_cmap(struct fb_cmap *cmap, int kspc, int con,
-			  struct fb_info *info);
 extern int gen_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
-extern int fbgen_set_cmap(struct fb_cmap *cmap, int kspc, int con,
-			  struct fb_info *info);
 extern int gen_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
-extern int fbgen_pan_display(struct fb_var_screeninfo *var, int con,
+extern int fb_pan_display(struct fb_var_screeninfo *var, int con,
 			     struct fb_info *info);
 extern void cfb_fillrect(struct fb_info *info, struct fb_fillrect *rect); 
 extern void cfb_copyarea(struct fb_info *info, struct fb_copyarea *region); 
@@ -466,16 +419,9 @@ extern void cfb_imageblit(struct fb_info *info, struct fb_image *image);
      *  Helper functions
      */
 
-extern int fbgen_do_set_var(struct fb_var_screeninfo *var, int isactive,
-			    struct fb_info_gen *info);
-extern void fbgen_set_disp(int con, struct fb_info_gen *info);
-extern void do_install_cmap(int con, struct fb_info *info);
-extern int fbgen_update_var(int con, struct fb_info *info);
 extern int gen_update_var(int con, struct fb_info *info);
-extern int fbgen_switch(int con, struct fb_info *info);
-extern int fbgen_blank(int blank, struct fb_info *info);
+extern int fb_blank(int blank, struct fb_info *info);
 extern int gen_switch(int con, struct fb_info *info);
-
 extern void gen_set_disp(int con, struct fb_info *info);
 
 /* drivers/video/fbmem.c */