r3982 - in people/waldi/kernel/source/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/arm arch/hppa arch/i386 arch/ia64 arch/m68k arch/powerpc arch/s390 arch/sparc

Bastian Blank waldi at costa.debian.org
Fri Aug 19 12:40:06 UTC 2005


Author: waldi
Date: 2005-08-19 12:40:02 +0000 (Fri, 19 Aug 2005)
New Revision: 3982

Modified:
   people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config
   people/waldi/kernel/source/linux-2.6/debian/arch/amd64/config
   people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.footbridge
   people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.ixp4xx
   people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.rpc
   people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.s3c2410
   people/waldi/kernel/source/linux-2.6/debian/arch/config
   people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config
   people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32
   people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp
   people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64
   people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp
   people/waldi/kernel/source/linux-2.6/debian/arch/i386/config
   people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.amiga
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.atari
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.bvme6000
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.hp
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mac
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mvme147
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mvme16x
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.q40
   people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.sun3
   people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config
   people/waldi/kernel/source/linux-2.6/debian/arch/s390/config
   people/waldi/kernel/source/linux-2.6/debian/arch/sparc/config
   people/waldi/kernel/source/linux-2.6/debian/changelog
Log:
debian/arch/, debian/changelog: Revert revisions 3936 and 3981.


Modified: people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -508,6 +508,13 @@
 # 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_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_BRIDGE=m
 CONFIG_DECNET=m
 # CONFIG_DECNET_ROUTER is not set
@@ -814,6 +821,7 @@
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
+CONFIG_ATM_TCP=m
 CONFIG_ATM_LANAI=m
 CONFIG_ATM_ENI=m
 # CONFIG_ATM_ENI_DEBUG is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/amd64/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/amd64/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/amd64/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -528,6 +528,13 @@
 # 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_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_BRIDGE=m
 CONFIG_DECNET=m
 # CONFIG_DECNET_ROUTER is not set
@@ -789,6 +796,7 @@
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
 # CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_TCP=m
 CONFIG_ATM_LANAI=m
 CONFIG_ATM_ENI=m
 # CONFIG_ATM_ENI_DEBUG is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.footbridge
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.footbridge	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.footbridge	2005-08-19 12:40:02 UTC (rev 3982)
@@ -360,6 +360,8 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+CONFIG_ATM=y
+# CONFIG_ATM_CLIP is not set
 # CONFIG_ATM_LANE is not set
 # CONFIG_ATM_BR2684 is not set
 # CONFIG_BRIDGE is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.ixp4xx
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.ixp4xx	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.ixp4xx	2005-08-19 12:40:02 UTC (rev 3982)
@@ -544,6 +544,8 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+CONFIG_ATM=y
+CONFIG_ATM_CLIP=y
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.rpc
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.rpc	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.rpc	2005-08-19 12:40:02 UTC (rev 3982)
@@ -359,6 +359,7 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.s3c2410
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.s3c2410	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/arm/config.s3c2410	2005-08-19 12:40:02 UTC (rev 3982)
@@ -763,6 +763,7 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -178,11 +178,3 @@
 CONFIG_TCG_NSC=m
 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_6PACK=m
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-# CONFIG_ATM_TCP is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -576,6 +576,7 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32	2005-08-19 12:40:02 UTC (rev 3982)
@@ -576,6 +576,7 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp	2005-08-19 12:40:02 UTC (rev 3982)
@@ -580,6 +580,7 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64	2005-08-19 12:40:02 UTC (rev 3982)
@@ -574,6 +574,7 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp	2005-08-19 12:40:02 UTC (rev 3982)
@@ -578,6 +578,7 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/i386/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -624,6 +624,13 @@
 # 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_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_BRIDGE=m
 CONFIG_DECNET=m
 # CONFIG_DECNET_ROUTER is not set
@@ -941,6 +948,7 @@
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
 # CONFIG_SBNI_MULTILINE is not set
+CONFIG_ATM_TCP=m
 CONFIG_ATM_LANAI=m
 CONFIG_ATM_ENI=m
 # CONFIG_ATM_ENI_DEBUG is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/ia64/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -463,6 +463,7 @@
 CONFIG_SCTP_HMAC_NONE=y
 # CONFIG_SCTP_HMAC_SHA1 is not set
 # CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_DECNET=m
 # CONFIG_DECNET_ROUTER is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -433,6 +433,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.amiga
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.amiga	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.amiga	2005-08-19 12:40:02 UTC (rev 3982)
@@ -433,6 +433,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.atari
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.atari	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.atari	2005-08-19 12:40:02 UTC (rev 3982)
@@ -390,6 +390,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.bvme6000
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.bvme6000	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.bvme6000	2005-08-19 12:40:02 UTC (rev 3982)
@@ -364,6 +364,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.hp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.hp	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.hp	2005-08-19 12:40:02 UTC (rev 3982)
@@ -361,6 +361,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mac
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mac	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mac	2005-08-19 12:40:02 UTC (rev 3982)
@@ -397,6 +397,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mvme147
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mvme147	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mvme147	2005-08-19 12:40:02 UTC (rev 3982)
@@ -361,6 +361,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mvme16x
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mvme16x	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.mvme16x	2005-08-19 12:40:02 UTC (rev 3982)
@@ -364,6 +364,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.q40
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.q40	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.q40	2005-08-19 12:40:02 UTC (rev 3982)
@@ -407,6 +407,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.sun3
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.sun3	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/config.sun3	2005-08-19 12:40:02 UTC (rev 3982)
@@ -348,6 +348,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -387,6 +387,13 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_CLIP_NO_ICMP=y
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_BRIDGE=m
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y
@@ -642,6 +649,7 @@
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
+CONFIG_ATM_TCP=m
 CONFIG_ATM_LANAI=m
 CONFIG_ATM_ENI=m
 # CONFIG_ATM_ENI_DEBUG is not set

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/s390/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/s390/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/s390/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -167,6 +167,7 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 CONFIG_SCTP_HMAC_SHA1=y
 # CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_DECNET is not set
 CONFIG_LLC=y

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/sparc/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/sparc/config	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/sparc/config	2005-08-19 12:40:02 UTC (rev 3982)
@@ -209,6 +209,7 @@
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
 # CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y

Modified: people/waldi/kernel/source/linux-2.6/debian/changelog
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/changelog	2005-08-19 10:31:32 UTC (rev 3981)
+++ people/waldi/kernel/source/linux-2.6/debian/changelog	2005-08-19 12:40:02 UTC (rev 3982)
@@ -1,14 +1,10 @@
 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.  Make it the same for all archs, too.
-    (closes: #323143) (Andres Salomon)
-
   * [powerpc]
     - Added pmac-sound sanity check patch.
     - Added preliminary apus patch, not applied though.
 
- -- Sven Luther <luther at debian.org>  Wed, 17 Aug 2005 16:01:26 +0200
+ -- Bastian Blank <waldi at debian.org>  Fri, 19 Aug 2005 14:39:16 +0200
 
 linux-2.6 (2.6.12-5) unstable; urgency=low
 




More information about the Kernel-svn-changes mailing list