patch-2.3.16 linux/drivers/video/fbmem.c

Next file: linux/drivers/video/leofb.c
Previous file: linux/drivers/video/fbcon.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/drivers/video/fbmem.c linux/drivers/video/fbmem.c
@@ -92,6 +92,8 @@
 extern int sbusfb_setup(char*);
 extern int valkyriefb_init(void);
 extern int valkyriefb_setup(char*);
+extern int control_init(void);
+extern int control_setup(char*);
 extern int g364fb_init(void);
 extern int fm2fb_init(void);
 extern int fm2fb_setup(char*);
@@ -176,6 +178,9 @@
 #ifdef CONFIG_FB_HP300
 	{ "hpfb", hpfb_init, hpfb_setup },
 #endif 
+#ifdef CONFIG_FB_CONTROL
+	{ "controlfb", control_init, control_setup },
+#endif
 #ifdef CONFIG_FB_VALKYRIE
 	{ "valkyriefb", valkyriefb_init, valkyriefb_setup },
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)