r2277 - in trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8: config debian

[Norbert Tretkowski]

Author: nobse
Date: 2005-01-12 10:19:33 +0100 (Wed, 12 Jan 2005)
New Revision: 2277

Modified:
   trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/generic
   trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/smp
   trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/changelog
Log:
enabled CONFIG_FB_MATROX* again


Modified: trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/generic
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/generic	2005-01-12 08:30:49 UTC (rev 2276)
+++ trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/generic	2005-01-12 09:19:33 UTC (rev 2277)
@@ -1854,7 +1854,14 @@
 CONFIG_FB_RIVA=m
 # CONFIG_FB_RIVA_I2C is not set
 # CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_MATROX is not set
+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_RADEON_OLD=m
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y

Modified: trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/smp
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/smp	2005-01-12 08:30:49 UTC (rev 2276)
+++ trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/smp	2005-01-12 09:19:33 UTC (rev 2277)
@@ -1798,7 +1798,14 @@
 CONFIG_FB_RIVA=m
 # CONFIG_FB_RIVA_I2C is not set
 # CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_MATROX is not set
+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_RADEON_OLD=m
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y

Modified: trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/changelog	2005-01-12 08:30:49 UTC (rev 2276)
+++ trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/changelog	2005-01-12 09:19:33 UTC (rev 2277)
@@ -5,11 +5,12 @@
   * bumped SONAME because of ABI changes in one of the security fixes from
     kernel-source-2.6.8 2.6.8-11
   * enabled CONFIG_SCSI_QLOGIC_1280_1040
+  * enabled CONFIG_FB_MATROX* again
   * compiled CONFIG_SECURITY_CAPABILITIES into kernel
   * compiled CONFIG_EXT2_FS as module
   * depend on initrd-tools (>= 0.1.77)
 
- -- Norbert Tretkowski <nobse@debian.org>  Wed, 12 Jan 2005 08:16:23 +0100
+ -- Norbert Tretkowski <nobse@debian.org>  Wed, 12 Jan 2005 10:24:25 +0100
 
 kernel-image-2.6.8-alpha (2.6.8-6) unstable; urgency=high