Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv13887/linux/drivers/video
Modified Files:
Config.in Makefile fbmem.c
Removed Files:
sa1100fb.c sa1100fb.h
Log Message:
Synced to 2.5.8.
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Config.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Config.in 12 Apr 2002 18:08:09 -0000 1.60
+++ Config.in 16 Apr 2002 17:41:51 -0000 1.61
@@ -3,7 +3,7 @@
#
mainmenu_option next_comment
-comment 'Video '
+comment 'Graphics support'
#
# Video card configuration
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Makefile 12 Apr 2002 18:08:09 -0000 1.45
+++ Makefile 16 Apr 2002 17:41:52 -0000 1.46
@@ -50,6 +50,7 @@
obj-$(CONFIG_FB_PLATINUM) += platinumfb.o
obj-$(CONFIG_FB_VALKYRIE) += valkyriefb.o
obj-$(CONFIG_FB_CT65550) += chipsfb.o
+obj-$(CONFIG_FB_ANAKIN) += anakinfb.o
obj-$(CONFIG_FB_CLPS711X) += clps711xfb.o
obj-$(CONFIG_FB_CYBER) += cyberfb.o
obj-$(CONFIG_FB_CYBER2000) += cyber2000fb.o
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbmem.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- fbmem.c 23 Mar 2002 00:22:58 -0000 1.61
+++ fbmem.c 16 Apr 2002 17:41:52 -0000 1.62
@@ -60,6 +60,7 @@
extern int acornfb_setup(char*);
extern int amifb_init(void);
extern int amifb_setup(char*);
+extern int anakinfb_init(void);
extern int atafb_init(void);
extern int atafb_setup(char*);
extern int macfb_init(void);
@@ -72,6 +73,7 @@
extern int pm3fb_setup(char*);
extern int clps711xfb_init(void);
extern int cyber2000fb_init(void);
+extern int cyber2000fb_setup(char*);
extern int retz3fb_init(void);
extern int retz3fb_setup(char*);
extern int clgenfb_init(void);
@@ -172,14 +174,17 @@
#ifdef CONFIG_FB_AMIGA
{ "amifb", amifb_init, amifb_setup },
#endif
+#ifdef CONFIG_FB_ANAKIN
+ { "anakinfb", anakinfb_init, NULL },
+#endif
#ifdef CONFIG_FB_CLPS711X
- { "clps711xfb", clps711xfb_init, NULL },
+ { "clps711xfb", clps711xfb_init, NULL },
#endif
#ifdef CONFIG_FB_CYBER
{ "cyber", cyberfb_init, cyberfb_setup },
#endif
#ifdef CONFIG_FB_CYBER2000
- { "cyber2000", cyber2000fb_init, NULL },
+ { "cyber2000", cyber2000fb_init, cyber2000fb_setup },
#endif
#ifdef CONFIG_FB_PM2
{ "pm2fb", pm2fb_init, pm2fb_setup },
--- sa1100fb.c DELETED ---
--- sa1100fb.h DELETED ---
|
