r3999 - in branches/dist/sid/kernel/linux-2.6/debian: . arch/alpha arch/amd64 arch/arm arch/i386 arch/powerpc

[Bastian Blank]

Author: waldi
Date: 2005-08-21 14:44:50 +0000 (Sun, 21 Aug 2005)
New Revision: 3999

Modified:
   branches/dist/sid/kernel/linux-2.6/debian/arch/alpha/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/amd64/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.ixp4xx
   branches/dist/sid/kernel/linux-2.6/debian/arch/i386/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config
   branches/dist/sid/kernel/linux-2.6/debian/changelog
Log:
* debian/arch/alpha/config, debian/arch/amd64/config, debian/arch/arm/config.ixp4xx
  debian/arch/i386/config, debian/arch/powerpc/config: Make ATM modular.
* debian/changelog: Update.


Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/alpha/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/alpha/config	2005-08-21 01:56:09 UTC (rev 3998)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/alpha/config	2005-08-21 14:44:50 UTC (rev 3999)
@@ -508,8 +508,8 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-CONFIG_ATM=y
-CONFIG_ATM_CLIP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/amd64/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/amd64/config	2005-08-21 01:56:09 UTC (rev 3998)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/amd64/config	2005-08-21 14:44:50 UTC (rev 3999)
@@ -528,8 +528,8 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-CONFIG_ATM=y
-CONFIG_ATM_CLIP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.ixp4xx
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.ixp4xx	2005-08-21 01:56:09 UTC (rev 3998)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.ixp4xx	2005-08-21 14:44:50 UTC (rev 3999)
@@ -544,8 +544,8 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
-CONFIG_ATM=y
-CONFIG_ATM_CLIP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/i386/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/i386/config	2005-08-21 01:56:09 UTC (rev 3998)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/i386/config	2005-08-21 14:44:50 UTC (rev 3999)
@@ -624,8 +624,8 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-CONFIG_ATM=y
-CONFIG_ATM_CLIP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config	2005-08-21 01:56:09 UTC (rev 3998)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config	2005-08-21 14:44:50 UTC (rev 3999)
@@ -389,7 +389,7 @@
 CONFIG_SCTP_HMAC_MD5=y
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
-CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
@@ -656,7 +656,7 @@
 # CONFIG_ATM_ENI_TUNE_BURST is not set
 CONFIG_ATM_FIRESTREAM=m
 CONFIG_ATM_ZATM=m
-CONFIG_ATM_ZATM_DEBUG=y
+# CONFIG_ATM_ZATM_DEBUG is not set
 CONFIG_ATM_NICSTAR=m
 CONFIG_ATM_NICSTAR_USE_SUNI=y
 CONFIG_ATM_NICSTAR_USE_IDT77105=y
@@ -673,7 +673,7 @@
 CONFIG_ATM_FORE200E_MAYBE=m
 CONFIG_ATM_FORE200E_PCA=y
 CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
-CONFIG_ATM_FORE200E_USE_TASKLET=y
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
 CONFIG_ATM_FORE200E_TX_RETRY=16
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_FORE200E=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/changelog
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/changelog	2005-08-21 01:56:09 UTC (rev 3998)
+++ branches/dist/sid/kernel/linux-2.6/debian/changelog	2005-08-21 14:44:50 UTC (rev 3999)
@@ -1,10 +1,14 @@
 linux-2.6 (2.6.12-6) UNRELEASED; urgency=low
 
+  * Change ATM and Classical-IP-over-ATM to be modular, instead of being
+    statically included.
+    (closes: #323143) (Andres Salomon, Bastian Blank)
+
   * [powerpc]
     - Added pmac-sound sanity check patch.
     - Added preliminary apus patch, not applied though.
 
- -- Bastian Blank <waldi at debian.org>  Fri, 19 Aug 2005 14:39:16 +0200
+ -- Bastian Blank <waldi at debian.org>  Sat, 20 Aug 2005 11:57:45 +0200
 
 linux-2.6 (2.6.12-5) unstable; urgency=low