r983 - in trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7: config debian

[Norbert Tretkowski]

Author: nobse
Date: 2004-08-08 08:35:10 -0600 (Sun, 08 Aug 2004)
New Revision: 983

Modified:
   trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/config/generic
   trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/config/smp
   trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/debian/changelog
Log:
disabled CONFIG_FB_MATROX, which is still broken on 2.6 kernels


Modified: trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/config/generic
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/config/generic	2004-08-06 12:22:24 UTC (rev 982)
+++ trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/config/generic	2004-08-08 14:35:10 UTC (rev 983)
@@ -1820,14 +1820,7 @@
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_TGA=m
 CONFIG_FB_RIVA=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G450=y
-CONFIG_FB_MATROX_G100=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
+# CONFIG_FB_MATROX is not set
 CONFIG_FB_RADEON_OLD=m
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y

Modified: trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/config/smp
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/config/smp	2004-08-06 12:22:24 UTC (rev 982)
+++ trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/config/smp	2004-08-08 14:35:10 UTC (rev 983)
@@ -1763,14 +1763,7 @@
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_TGA=m
 CONFIG_FB_RIVA=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G450=y
-CONFIG_FB_MATROX_G100=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
+# CONFIG_FB_MATROX is not set
 CONFIG_FB_RADEON_OLD=m
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y

Modified: trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/debian/changelog
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/debian/changelog	2004-08-06 12:22:24 UTC (rev 982)
+++ trunk/kernel/alpha/kernel-image-2.6.7-alpha-2.6.7/debian/changelog	2004-08-08 14:35:10 UTC (rev 983)
@@ -1,3 +1,9 @@
+kernel-image-2.6.7-alpha (2.6.7-2) unstable; urgency=low
+
+  * disabled CONFIG_FB_MATROX, which is still broken on 2.6 kernels
+
+ -- Norbert Tretkowski <nobse@debian.org>  Sun, 08 Jul 2004 11:13:25 +0200
+
 kernel-image-2.6.7-alpha (2.6.7-1) unstable; urgency=low
 
   * new upstream release