[Linux-mips-commits]CVS: linux/drivers/video Config.in,1.5,1.6 Makefile,1.4,1.5

[Paul M. <le...@us...>]

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

Modified Files:
	Config.in Makefile 
Log Message:
Synced with Ralf's 2.4.8 code.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Config.in	2001/08/25 02:19:28	1.5
--- Config.in	2001/08/25 06:24:45	1.6
***************
*** 60,63 ****
--- 60,66 ----
        bool '  Atari native chipset support' CONFIG_FB_ATARI
        tristate '  ATI Mach64 display support' CONFIG_FB_ATY
+       if [ "$CONFIG_FB_ATY" != "n" ]; then
+ 	 define_bool CONFIG_FB_ATY_GX y
+       fi
     fi
     if [ "$CONFIG_PPC" = "y" ]; then
***************
*** 124,127 ****
--- 127,134 ----
  	 fi
  	 tristate '  ATI Mach64 display support (EXPERIMENTAL)' CONFIG_FB_ATY
+ 	 if [ "$CONFIG_FB_ATY" != "n" ]; then
+ 	    bool '    Mach64 GX support (EXPERIMENTAL)' CONFIG_FB_ATY_GX
+ 	    bool '    Mach64 CT/VT/GT/LT (incl. 3D RAGE) support' CONFIG_FB_ATY_CT
+ 	 fi
  	 tristate '  ATI Rage 128 display support (EXPERIMENTAL)' CONFIG_FB_ATY128
  	 tristate '  3Dfx Banshee/Voodoo3 display support (EXPERIMENTAL)' CONFIG_FB_3DFX
***************
*** 165,168 ****
--- 172,178 ----
  	 if [ "$CONFIG_FB_PCI" != "n" ]; then
  	    tristate '    ATI Mach64 display support' CONFIG_FB_ATY
+ 	    if [ "$CONFIG_FB_ATY" != "n" ]; then
+ 	       define_bool CONFIG_FB_ATY_CT y
+ 	    fi
  	 fi
        fi

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	2001/08/25 02:19:28	1.4
--- Makefile	2001/08/25 06:24:45	1.5
***************
*** 47,51 ****
  obj-$(CONFIG_FB_Q40)              += q40fb.o
  obj-$(CONFIG_FB_ATARI)            += atafb.o
- obj-$(CONFIG_FB_ATY)              += atyfb.o
  obj-$(CONFIG_FB_ATY128)           += aty128fb.o
  obj-$(CONFIG_FB_IGA)              += igafb.o
--- 47,50 ----
***************
*** 98,101 ****
--- 97,105 ----
  ifeq ($(CONFIG_FB_SIS),y)
  obj-y				  += sis/sisfb.o
+ endif
+ 
+ subdir-$(CONFIG_FB_ATY)		  += aty
+ ifeq ($(CONFIG_FB_ATY),y)
+ obj-y				  += aty/atyfb.o
  endif