[kernel] r13567 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 i386 ia64 mips mipsel powerpc

Maximilian Attems maks at alioth.debian.org
Tue May 5 13:45:56 UTC 2009 

Author: maks
Date: Tue May  5 13:45:55 2009
New Revision: 13567

Log:
topconfig centralize 3Dfx fb options

alpha strangely enabled the accel option that no one else did,
most probably an oversight.
set te new FB_3DFX_I2C support.

Modified:
   dists/trunk/linux-2.6/debian/config/alpha/config
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/powerpc/config
   dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Tue May  5 13:45:55 2009	(r13567)
@@ -1090,8 +1090,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_TRIDENT_ACCEL=y

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Tue May  5 13:45:55 2009	(r13567)
@@ -1279,8 +1279,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/config	Tue May  5 13:45:55 2009	(r13567)
@@ -2190,6 +2190,9 @@
 CONFIG_FB_INTEL_I2C=y
 CONFIG_FB_S3=m
 CONFIG_FB_VIA=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
 CONFIG_FB_VT8623=m
 CONFIG_FB_CYBLA=m
 CONFIG_FB_ARK=m

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Tue May  5 13:45:55 2009	(r13567)
@@ -1518,8 +1518,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Tue May  5 13:45:55 2009	(r13567)
@@ -777,8 +777,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Tue May  5 13:45:55 2009	(r13567)
@@ -1345,8 +1345,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Tue May  5 13:45:55 2009	(r13567)
@@ -1618,8 +1618,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_VT8623=m
 CONFIG_FB_TRIDENT=m

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Tue May  5 13:45:55 2009	(r13567)
@@ -803,8 +803,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Tue May  5 13:45:55 2009	(r13567)
@@ -804,8 +804,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Tue May  5 13:45:55 2009	(r13567)
@@ -1344,8 +1344,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Tue May  5 13:45:55 2009	(r13567)
@@ -1618,8 +1618,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_VT8623=m
 CONFIG_FB_TRIDENT=m

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Tue May  5 13:45:55 2009	(r13567)
@@ -803,8 +803,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Tue May  5 13:45:55 2009	(r13567)
@@ -803,8 +803,6 @@
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Tue May  5 13:45:55 2009	(r13567)
@@ -880,7 +880,6 @@
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
 CONFIG_FB_3DFX=y
-# CONFIG_FB_3DFX_ACCEL is not set
 CONFIG_FB_VOODOO1=y
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_TRIDENT_ACCEL=y

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot	Tue May  5 04:01:52 2009	(r13566)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot	Tue May  5 13:45:55 2009	(r13567)
@@ -101,7 +101,6 @@
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 CONFIG_FB_SIS=m
-CONFIG_FB_3DFX=m
 CONFIG_FB_VOODOO1=m
 
 ##

More information about the Kernel-svn-changes mailing list