r3021 - in trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11: config debian

[maximilian attems]

Author: maks-guest
Date: 2005-05-05 09:48:37 +0000 (Thu, 05 May 2005)
New Revision: 3021

Modified:
   trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686-smp
   trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7-smp
   trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog
Log:
enable CONFIG_MOXA_SMARTIO on smp.


Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686-smp
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686-smp	2005-05-04 23:42:17 UTC (rev 3020)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686-smp	2005-05-05 09:48:37 UTC (rev 3021)
@@ -1760,7 +1760,7 @@
 # CONFIG_DIGI is not set
 # CONFIG_ESPSERIAL is not set
 # CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
+CONFIG_MOXA_SMARTIO=m
 # CONFIG_ISI is not set
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m

Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7-smp
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7-smp	2005-05-04 23:42:17 UTC (rev 3020)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7-smp	2005-05-05 09:48:37 UTC (rev 3021)
@@ -1761,7 +1761,7 @@
 # CONFIG_DIGI is not set
 # CONFIG_ESPSERIAL is not set
 # CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
+CONFIG_MOXA_SMARTIO=m
 # CONFIG_ISI is not set
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m

Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog	2005-05-04 23:42:17 UTC (rev 3020)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog	2005-05-05 09:48:37 UTC (rev 3021)
@@ -1,3 +1,10 @@
+kernel-image-2.6.11-i386 (2.6.11-4) unstable; urgency=low
+
+  * Enable CONFIG_MOXA_SMARTIO in 686-smp and k7-smp configs, since no longer
+    broken on smp. (Closes: #307426) (Maximilian Attems)
+
+ -- 
+
 kernel-image-2.6.11-i386 (2.6.11-3) unstable; urgency=low
 
   * Build against 2.6.11-3 (Andres Salomon).