Menu
▾
▴
[Linux-mips-commits]CVS: linux/drivers/video Config.in,1.4,1.5 Makefile,1.3,1.4 fbmem.c,1.2,1.3
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/video
Modified Files:
Config.in Makefile fbmem.c
Log Message:
Sync to 2.4.7
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Config.in 2001/07/23 23:43:11 1.4
--- Config.in 2001/08/25 02:19:28 1.5
***************
*** 104,110 ****
hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
fi
! if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
! tristate ' Dreamcast Frame Buffer support' CONFIG_FB_DC
! fi
bool ' MediaQ Framebuffer support' CONFIG_FB_MQ200
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
--- 104,109 ----
hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
fi
! tristate ' NEC PowerVR 2 display support' CONFIG_FB_PVR2
! dep_bool ' Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
bool ' MediaQ Framebuffer support' CONFIG_FB_MQ200
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
***************
*** 289,293 ****
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \
! "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SA1100" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 y
else
--- 288,293 ----
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \
! "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SA1100" = "y" -o \
! "$CONFIG_FB_PVR2" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 y
else
***************
*** 303,307 ****
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
! "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_MQ200" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 m
fi
--- 303,308 ----
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
! "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_PVR2" = "m" -o \
! "$CONFIG_FB_MQ200" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 m
fi
***************
*** 311,315 ****
"$CONFIG_FB_MATROX" = "y" -o "$CONFIG_FB_PM2" = "y" -o \
"$CONFIG_FB_ATY128" = "y" -o \
! "$CONFIG_FB_CYBER2000" = "y" ]; then
define_tristate CONFIG_FBCON_CFB24 y
else
--- 312,316 ----
"$CONFIG_FB_MATROX" = "y" -o "$CONFIG_FB_PM2" = "y" -o \
"$CONFIG_FB_ATY128" = "y" -o \
! "$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_PVR2" = "y" ]; then
define_tristate CONFIG_FBCON_CFB24 y
else
***************
*** 318,322 ****
"$CONFIG_FB_MATROX" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
"$CONFIG_FB_ATY128" = "m" -o \
! "$CONFIG_FB_CYBER2000" = "m" ]; then
define_tristate CONFIG_FBCON_CFB24 m
fi
--- 319,323 ----
"$CONFIG_FB_MATROX" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
"$CONFIG_FB_ATY128" = "m" -o \
! "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_PVR2" = "m" ]; then
define_tristate CONFIG_FBCON_CFB24 m
fi
***************
*** 329,333 ****
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_FM2" = "y" -o "$CONFIG_FB_SGIVW" = "y" -o \
! "$CONFIG_FB_3DFX" = "y" -o "$CONFIG_FB_SIS" = "y" ]; then
define_tristate CONFIG_FBCON_CFB32 y
else
--- 330,335 ----
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_FM2" = "y" -o "$CONFIG_FB_SGIVW" = "y" -o \
! "$CONFIG_FB_3DFX" = "y" -o "$CONFIG_FB_SIS" = "y" -o \
! "$CONFIG_FB_PVR2" = "y" ]; then
define_tristate CONFIG_FBCON_CFB32 y
else
***************
*** 339,343 ****
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_3DFX" = "m" -o \
! "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" ]; then
define_tristate CONFIG_FBCON_CFB32 m
fi
--- 341,346 ----
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_3DFX" = "m" -o \
! "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
! "$CONFIG_FB_PVR2" = "m" ]; then
define_tristate CONFIG_FBCON_CFB32 m
fi
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile 2001/07/23 21:05:24 1.3
--- Makefile 2001/08/25 02:19:28 1.4
***************
*** 108,112 ****
obj-$(CONFIG_FB_E1355) += epson1355fb.o fbgen.o
obj-$(CONFIG_FB_E1356) += epson1356fb.o
! obj-$(CONFIG_FB_DC) += dcfb.o fbgen.o
# Generic Low Level Drivers
--- 108,112 ----
obj-$(CONFIG_FB_E1355) += epson1355fb.o fbgen.o
obj-$(CONFIG_FB_E1356) += epson1356fb.o
! obj-$(CONFIG_FB_PVR2) += pvr2fb.o
# Generic Low Level Drivers
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fbmem.c 2001/07/23 21:09:43 1.2
--- fbmem.c 2001/08/25 02:19:28 1.3
***************
*** 130,134 ****
extern int e1355fb_init(void);
extern int e1355fb_setup(char*);
! extern int dcfb_init(void);
extern int mq200fb_init(void);
extern int mq200fb_setup(char*);
--- 130,135 ----
extern int e1355fb_init(void);
extern int e1355fb_setup(char*);
! extern int pvr2fb_init(void);
! extern int pvr2fb_setup(char*);
extern int mq200fb_init(void);
extern int mq200fb_setup(char*);
***************
*** 283,288 ****
{ "e1355fb", e1355fb_init, e1355fb_setup },
#endif
! #ifdef CONFIG_FB_DC
! { "dcfb", dcfb_init, NULL },
#endif
#ifdef CONFIG_FB_MQ200
--- 284,289 ----
{ "e1355fb", e1355fb_init, e1355fb_setup },
#endif
! #ifdef CONFIG_FB_PVR2
! { "pvr2", pvr2fb_init, pvr2fb_setup },
#endif
#ifdef CONFIG_FB_MQ200
|
