r904 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7: config debian
Author: jensen
Date: 2004-07-15 11:51:38 -0600 (Thu, 15 Jul 2004)
New Revision: 904
Modified:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/config/common.stub
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog
Log:
Built Matrox framebuffer driver into the kernel again.
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/config/common.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/config/common.stub 2004-07-15 17:45:57 UTC (rev 903)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/config/common.stub 2004-07-15 17:51:38 UTC (rev 904)
@@ -1453,7 +1453,7 @@
# CONFIG_FB_S3TRIO is not set
# CONFIG_FB_VGA16 is not set
CONFIG_FB_RIVA=m
-CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX=y
CONFIG_FB_MATROX_MILLENIUM=y
CONFIG_FB_MATROX_MYSTIQUE=y
CONFIG_FB_MATROX_G450=y
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog 2004-07-15 17:45:57 UTC (rev 903)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog 2004-07-15 17:51:38 UTC (rev 904)
@@ -3,8 +3,11 @@
* Migrated the pegasos patch to the kernel-source package, as it will be
accepted upstream (Sven Luther).
- -- Sven Luther <luther@debian.org> Sun, 11 Jul 2004 13:57:24 +0200
+ * Built the Matrox framebuffer driver into the kernel again (closes:
+ Bug#259250) (Jens Schmalzing).
+ -- Jens Schmalzing <jensen@debian.org> Thu, 15 Jul 2004 19:49:22 +0200
+
kernel-patch-powerpc-2.6.7 (2.6.7-3) unstable; urgency=high
* Upgraded the pegasos.diff patch to the one submitted upstream (Sven
Reply to: