patch-2.1.36 linux/arch/m68k/amiga/cyberfb.c

• Lines: 42
• Date: Thu Apr 17 13:20:41 1997
• Orig file: v2.1.35/linux/arch/m68k/amiga/cyberfb.c
• Orig date: Fri Dec 20 01:19:57 1996

diff -u --recursive --new-file v2.1.35/linux/arch/m68k/amiga/cyberfb.c linux/arch/m68k/amiga/cyberfb.c
@@ -32,7 +32,7 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/zorro.h>
+#include <linux/zorro.h>
 #include <asm/pgtable.h>
 #include <linux/fb.h>
 #include "s3blit.h"
@@ -235,6 +235,7 @@
 static int Cyberfb_switch(int con);
 static int Cyberfb_updatevar(int con);
 static void Cyberfb_blank(int blank);
+static int Cyberfb_setcmap(struct fb_cmap *cmap, int con);
 
 
    /*
@@ -1179,6 +1180,7 @@
    fb_info.switch_con = &Cyberfb_switch;
    fb_info.updatevar = &Cyberfb_updatevar;
    fb_info.blank = &Cyberfb_blank;
+   fb_info.setcmap = &Cyberfb_setcmap;
 
    do_fb_set_var(&Cyber_fb_predefined[0], 1);
    Cyber_fb_get_var(&disp[0].var, -1);
@@ -1222,6 +1224,16 @@
 static void Cyberfb_blank(int blank)
 {
    fbhw->blank(blank);
+}
+
+
+   /*
+    *    Set the colormap
+    */
+
+static int Cyberfb_setcmap(struct fb_cmap *cmap, int con)
+{
+   return(Cyber_fb_set_cmap(cmap, 1, con));
 }