Ported Voodoo3+ cards over to new api.

diff --git a/drivers/video/Config.in b/drivers/video/Config.in
index 0455c2011c605ce5fc4eee99bf8fa3688d818f62..0d8372fde80602f581e587c88fd4c12ad77103e2 100644 (file)
--- a/drivers/video/Config.in
+++ b/drivers/video/Config.in
@@ -273,10 +273,9 @@ if [ "$CONFIG_FB" = "y" ]; then
           "$CONFIG_FB_P9100" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
           "$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_RADEON" = "y" -o \
           "$CONFIG_FB_SGIVW" = "y" -o "$CONFIG_FB_CYBER2000" = "y" -o \
-          "$CONFIG_FB_SA1100" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \
+          "$CONFIG_FB_SA1100" = "y" -o "$CONFIG_FB_SIS" = "y" -o \
           "$CONFIG_FB_PMAG_BA" = "y" -o "$CONFIG_FB_PMAGB_B" = "y" -o \
-          "$CONFIG_FB_MAXINE" = "y" -o "$CONFIG_FB_TX3912" = "y" -o \
-          "$CONFIG_FB_SIS" = "y" ]; then 
+          "$CONFIG_FB_MAXINE" = "y" -o "$CONFIG_FB_TX3912" = "y" ]; then 
         define_tristate CONFIG_FBCON_CFB8 y
       else
         if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_ATARI" = "m" -o \
@@ -291,12 +290,11 @@ if [ "$CONFIG_FB" = "y" ]; then
               "$CONFIG_FB_IGA" = "m" -o "$CONFIG_FB_MATROX" = "m" -o \
              "$CONFIG_FB_CT65550" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
              "$CONFIG_FB_P9100" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
-             "$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_3DFX" = "m" -o \
+             "$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_TX3912" = "m" -o \
              "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_CYBER2000" = "m" -o \
              "$CONFIG_FB_PMAG_BA" = "m" -o "$CONFIG_FB_PMAGB_B" = "m" -o \
              "$CONFIG_FB_MAXINE" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
-             "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
-             "$CONFIG_FB_TX3912" = "m" ]; then 
+             "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" ]; then 
            define_tristate CONFIG_FBCON_CFB8 m
         fi
       fi
@@ -310,15 +308,15 @@ if [ "$CONFIG_FB" = "y" ]; then
           "$CONFIG_FB_CT65550" = "y" -o "$CONFIG_FB_MATROX" = "y" -o \
           "$CONFIG_FB_PM2" = "y" -o "$CONFIG_FB_SGIVW" = "y" -o \
           "$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
-          "$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_3DFX" = "y"  -o \
+          "$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_PM3" = "y"  -o \
           "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SA1100" = "y" -o \
-          "$CONFIG_FB_PVR2" = "y" -o "$CONFIG_FB_PM3" = "y" ]; then 
+          "$CONFIG_FB_PVR2" = "y" ]; then 
         define_tristate CONFIG_FBCON_CFB16 y
       else
         if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \
              "$CONFIG_FB_MAC" = "m" -o "$CONFIG_FB_NEOMAGIC" = "m" -o \
              "$CONFIG_FB_TRIDENT" = "m" -o "$CONFIG_FB_TBOX" = "m" -o \
-             "$CONFIG_FB_VOODOO1" = "m" -o "$CONFIG_FB_3DFX" = "m" -o \
+             "$CONFIG_FB_VOODOO1" = "m" -o "$CONFIG_FB_PM3" = "m" -o \
              "$CONFIG_FB_CONTROL" = "m" -o "$CONFIG_FB_CLGEN" = "m" -o \
              "$CONFIG_FB_VIRGE" = "m" -o "$CONFIG_FB_CYBER" = "m" -o \
              "$CONFIG_FB_VALKYRIE" = "m" -o "$CONFIG_FB_PLATINUM" = "m" -o \
@@ -327,7 +325,7 @@ if [ "$CONFIG_FB" = "y" ]; then
              "$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_RADEON" = "m" -o \
-             "$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_PM3" = "m" ]; then 
+             "$CONFIG_FB_PVR2" = "m" ]; then 
            define_tristate CONFIG_FBCON_CFB16 m
         fi
       fi
@@ -356,7 +354,7 @@ if [ "$CONFIG_FB" = "y" ]; then
           "$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
           "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SGIVW" = "y" -o \
           "$CONFIG_FB_RADEON" = "y" -o "$CONFIG_FB_PVR2" = "y" -o \
-          "$CONFIG_FB_3DFX" = "y" -o "$CONFIG_FB_PM3" = "y" ]; then
+          "$CONFIG_FB_PM3" = "y" ]; then
         define_tristate CONFIG_FBCON_CFB32 y
       else
         if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \
@@ -365,9 +363,9 @@ if [ "$CONFIG_FB" = "y" ]; then
              "$CONFIG_FB_TGA" = "m" -o "$CONFIG_FB_PLATINUM" = "m" -o \
              "$CONFIG_FB_MATROX" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
              "$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
-             "$CONFIG_FB_3DFX" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
+             "$CONFIG_FB_PM3" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \
              "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
-             "$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_PM3" = "y" ]; then
+             "$CONFIG_FB_PVR2" = "m" ]; then
            define_tristate CONFIG_FBCON_CFB32 m
         fi
       fi
@@ -375,12 +373,13 @@ if [ "$CONFIG_FB" = "y" ]; then
           "$CONFIG_FB_FM2" = "y" -o "$CONFIG_FB_HIT" = "y" -o \
           "$CONFIG_FB_HP300" = "y" -o "$CONFIG_FB_Q40" = "y" -o \
           "$CONFIG_FB_ANAKIN" = "y" -o "$CONFIG_FB_G364" = "y" -o \
-          "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_CLPS711X" = "y" ]; then
+          "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_CLPS711X" = "y" -o \
+          "$CONFIG_FB_3DFX" = "y" ]; then
         define_tristate CONFIG_FBCON_ACCEL y
       else
         if [ "$CONFIG_FB_NEOMAGIC" = "m" -o "$CONFIG_FB_HIT" = "m" -o \
              "$CONFIG_FB_G364" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" -o \
-             "$CONFIG_FB_CLPS711X" = "m" ]; then 
+             "$CONFIG_FB_CLPS711X" = "m" -o "$CONFIG_FB_3DFX" = "m" ]; then 
            define_tristate CONFIG_FBCON_ACCEL m
          fi       
       fi

diff --git a/include/video/tdfx.h b/include/video/tdfx.h
index 4b9904c2d75255692146d1a0ef7cb785f8031222..3120bfbeaac776693c1ae66e8e2b642ea00dfeb3 100644 (file)
--- a/include/video/tdfx.h
+++ b/include/video/tdfx.h
@@ -169,7 +169,6 @@ struct banshee_reg {
   unsigned long miscinit0;     
 };
 
-/*
 struct tdfx_par {
   u32 max_pixclock;
 
@@ -185,7 +184,7 @@ struct tdfx_par {
 
   spinlock_t DAClock;
 };
-*/
+
 #endif /* __KERNEL__ */
 
 #endif /* _TDFX_H */