r3983 - in trunk/kernel/source/linux-2.6: . debian debian/arch
debian/arch/alpha debian/arch/amd64 debian/arch/arm
debian/arch/hppa debian/arch/i386 debian/arch/ia64
debian/arch/m68k debian/arch/powerpc debian/arch/s390
debian/arch/sparc
Bastian Blank
waldi at costa.debian.org
Fri Aug 19 12:40:33 UTC 2005
Author: waldi
Date: 2005-08-19 12:40:28 +0000 (Fri, 19 Aug 2005)
New Revision: 3983
Modified:
trunk/kernel/source/linux-2.6/
trunk/kernel/source/linux-2.6/debian/arch/alpha/config
trunk/kernel/source/linux-2.6/debian/arch/amd64/config
trunk/kernel/source/linux-2.6/debian/arch/arm/config.footbridge
trunk/kernel/source/linux-2.6/debian/arch/arm/config.ixp4xx
trunk/kernel/source/linux-2.6/debian/arch/arm/config.rpc
trunk/kernel/source/linux-2.6/debian/arch/arm/config.s3c2410
trunk/kernel/source/linux-2.6/debian/arch/config
trunk/kernel/source/linux-2.6/debian/arch/hppa/config
trunk/kernel/source/linux-2.6/debian/arch/hppa/config.32
trunk/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp
trunk/kernel/source/linux-2.6/debian/arch/hppa/config.64
trunk/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp
trunk/kernel/source/linux-2.6/debian/arch/i386/config
trunk/kernel/source/linux-2.6/debian/arch/ia64/config
trunk/kernel/source/linux-2.6/debian/arch/m68k/config
trunk/kernel/source/linux-2.6/debian/arch/m68k/config.amiga
trunk/kernel/source/linux-2.6/debian/arch/m68k/config.atari
trunk/kernel/source/linux-2.6/debian/arch/m68k/config.bvme6000
trunk/kernel/source/linux-2.6/debian/arch/m68k/config.hp
trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mac
trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mvme147
trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mvme16x
trunk/kernel/source/linux-2.6/debian/arch/m68k/config.q40
trunk/kernel/source/linux-2.6/debian/arch/m68k/config.sun3
trunk/kernel/source/linux-2.6/debian/arch/powerpc/config
trunk/kernel/source/linux-2.6/debian/arch/s390/config
trunk/kernel/source/linux-2.6/debian/arch/sparc/config
trunk/kernel/source/linux-2.6/debian/changelog
Log:
debian/arch/, debian/changelog: Revert revisions 3936 and 3981.
Property changes on: trunk/kernel/source/linux-2.6
___________________________________________________________________
Name: svk:merge
- 510b9475-24dd-0310-9b6c-e0eefe99d49f:/branches/kernel/source/linux-2.6/release-2.6.12-2:3782
510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6:3976
+ 510b9475-24dd-0310-9b6c-e0eefe99d49f:/branches/kernel/source/linux-2.6/release-2.6.12-2:3782
510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6:3982
Modified: trunk/kernel/source/linux-2.6/debian/arch/alpha/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/alpha/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/alpha/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/amd64/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/amd64/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/amd64/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/arm/config.footbridge
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/arm/config.footbridge 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/arm/config.footbridge 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/arm/config.ixp4xx
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/arm/config.ixp4xx 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/arm/config.ixp4xx 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/arm/config.rpc
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/arm/config.rpc 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/arm/config.rpc 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/arm/config.s3c2410
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/arm/config.s3c2410 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/arm/config.s3c2410 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/hppa/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/hppa/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/hppa/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/hppa/config.32
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/hppa/config.32 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/hppa/config.32 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/hppa/config.64
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/hppa/config.64 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/hppa/config.64 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/i386/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/i386/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/i386/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/ia64/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/ia64/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/ia64/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config.amiga
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config.amiga 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config.amiga 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config.atari
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config.atari 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config.atari 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config.bvme6000
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config.bvme6000 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config.bvme6000 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config.hp
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config.hp 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config.hp 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mac
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mac 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mac 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mvme147
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mvme147 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mvme147 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mvme16x
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mvme16x 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config.mvme16x 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config.q40
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config.q40 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config.q40 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/m68k/config.sun3
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/m68k/config.sun3 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/m68k/config.sun3 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/powerpc/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/powerpc/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/powerpc/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/s390/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/s390/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/s390/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/arch/sparc/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/sparc/config 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/arch/sparc/config 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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: trunk/kernel/source/linux-2.6/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6/debian/changelog 2005-08-19 12:40:02 UTC (rev 3982)
+++ trunk/kernel/source/linux-2.6/debian/changelog 2005-08-19 12:40:28 UTC (rev 3983)
@@ -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