[linuxdc-cvs] CVS: linux/drivers/video Config.in,1.3,1.4 Makefile,1.2,1.3 fbmem.c,1.2,1.3

[M. R. B. <mr...@us...>]

Update of /cvsroot/linuxdc/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv9655/drivers/video

Modified Files:
	Config.in Makefile fbmem.c 
Log Message:
Vapor dcfb changed to _real_ pvr2dcfb...

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxdc/linux/drivers/video/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Config.in	2001/02/09 16:28:06	1.3
--- Config.in	2001/03/01 10:58:06	1.4
***************
*** 105,109 ****
     fi
     if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
!       tristate '  Dreamcast Frame Buffer support' CONFIG_FB_DC
     fi
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
--- 105,109 ----
     fi
     if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
!       tristate '  Dreamcast PowerVR2DC (pvr2dc) display support' CONFIG_FB_PVR2DC
     fi
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
***************
*** 263,267 ****
  	   "$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
--- 263,268 ----
  	   "$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_PVR2DC" = "y" ]; then
  	 define_tristate CONFIG_FBCON_CFB16 y
        else
***************
*** 277,281 ****
  	      "$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
  	      "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
! 	      "$CONFIG_FB_SA1100" = "m" ]; then
  	    define_tristate CONFIG_FBCON_CFB16 m
  	 fi
--- 278,282 ----
  	      "$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_PVR2DC" = "m" ]; then
  	    define_tristate CONFIG_FBCON_CFB16 m
  	 fi
***************
*** 285,289 ****
  	   "$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
--- 286,290 ----
  	   "$CONFIG_FB_MATROX" = "y" -o "$CONFIG_FB_PM2" = "y" -o \
             "$CONFIG_FB_ATY128" = "y" -o \
! 	   "$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_PVR2DC" = "y" ]; then
  	 define_tristate CONFIG_FBCON_CFB24 y
        else
***************
*** 292,296 ****
  	      "$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
--- 293,297 ----
  	      "$CONFIG_FB_MATROX" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
  	      "$CONFIG_FB_ATY128" = "m" -o \
! 	      "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_PVR2DC" = "m" ]; then
  	    define_tristate CONFIG_FBCON_CFB24 m
  	 fi
***************
*** 303,307 ****
  	   "$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
--- 304,309 ----
  	   "$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_PVR2DC" = "y" ]; then
  	 define_tristate CONFIG_FBCON_CFB32 y
        else
***************
*** 313,317 ****
  	      "$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
--- 315,320 ----
  	      "$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_PVR2DC" = "m" ]; then
  	    define_tristate CONFIG_FBCON_CFB32 m
  	 fi

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux/drivers/video/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile	2001/01/09 03:31:12	1.2
--- Makefile	2001/03/01 10:58:06	1.3
***************
*** 102,106 ****
  obj-$(CONFIG_FB_HIT)              += hitfb.o fbgen.o
  obj-$(CONFIG_FB_E1355)            += epson1355fb.o fbgen.o
! obj-$(CONFIG_FB_DC)               += dcfb.o fbgen.o
  
  # Generic Low Level Drivers
--- 102,106 ----
  obj-$(CONFIG_FB_HIT)              += hitfb.o fbgen.o
  obj-$(CONFIG_FB_E1355)            += epson1355fb.o fbgen.o
! obj-$(CONFIG_FB_PVR2DC)           += pvr2dcfb.o
  
  # Generic Low Level Drivers

Index: fbmem.c
===================================================================
RCS file: /cvsroot/linuxdc/linux/drivers/video/fbmem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fbmem.c	2001/01/09 03:31:12	1.2
--- fbmem.c	2001/03/01 10:58:06	1.3
***************
*** 118,122 ****
  extern int e1355fb_init(void);
  extern int e1355fb_setup(char*);
! extern int dcfb_init(void);
    
  static struct {
--- 118,123 ----
  extern int e1355fb_init(void);
  extern int e1355fb_setup(char*);
! extern int pvr2dcfb_init(void);
! extern int pvr2dcfb_setup(char*);
    
  static struct {
***************
*** 263,268 ****
  	{ "hitfb", hitfb_init, NULL },
  #endif
! #ifdef CONFIG_FB_DC
! 	{ "dcfb", dcfb_init, NULL },
  #endif
  
--- 264,269 ----
  	{ "hitfb", hitfb_init, NULL },
  #endif
! #ifdef CONFIG_FB_PVR2DC
! 	{ "pvr2dc", pvr2dcfb_init, pvr2dcfb_setup },
  #endif