From 0caf0400819c6e042deb0b0b1a4dece508a765e9 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Wed, 17 Aug 2005 04:44:13 +0000 Subject: [PATCH] * 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) svn path=/trunk/kernel/source/linux-2.6/; revision=3936 --- debian/arch/alpha/config | 2 -- debian/arch/amd64/config | 2 -- debian/arch/arm/config.footbridge | 2 -- debian/arch/arm/config.ixp4xx | 2 -- debian/arch/arm/config.rpc | 1 - debian/arch/arm/config.s3c2410 | 1 - debian/arch/config | 2 ++ debian/arch/hppa/config | 1 - debian/arch/hppa/config.32 | 1 - debian/arch/hppa/config.32-smp | 1 - debian/arch/hppa/config.64 | 1 - debian/arch/hppa/config.64-smp | 1 - debian/arch/i386/config | 2 -- debian/arch/ia64/config | 1 - debian/arch/m68k/config | 1 - debian/arch/m68k/config.amiga | 1 - debian/arch/m68k/config.atari | 1 - debian/arch/m68k/config.bvme6000 | 1 - debian/arch/m68k/config.hp | 1 - debian/arch/m68k/config.mac | 1 - debian/arch/m68k/config.mvme147 | 1 - debian/arch/m68k/config.mvme16x | 1 - debian/arch/m68k/config.q40 | 1 - debian/arch/m68k/config.sun3 | 1 - debian/arch/powerpc/config | 2 -- debian/arch/s390/config | 1 - debian/arch/sparc/config | 1 - debian/changelog | 8 ++++++++ 28 files changed, 10 insertions(+), 32 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 7c707cc3f..72ebfd5b4 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -508,8 +508,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 6e661be18..91002d9e8 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -528,8 +528,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index ff8554607..0c77fe196 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -360,8 +360,6 @@ CONFIG_SYN_COOKIES=y # 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 diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 0f48459aa..899cc9d05 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -544,8 +544,6 @@ CONFIG_XFRM=y # 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 diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 46c220598..713a3741d 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -359,7 +359,6 @@ CONFIG_IPV6=m # 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 diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index bca399168..f2af9bc51 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -763,7 +763,6 @@ CONFIG_IP_TCPDIAG=y # 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 diff --git a/debian/arch/config b/debian/arch/config index 9b67a168e..64e0e5785 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -178,3 +178,5 @@ CONFIG_TCG_ATMEL=m CONFIG_TCG_NSC=m # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set CONFIG_6PACK=m +CONFIG_ATM=m +CONFIG_ATM_CLIP=m diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index cefa35044..76a347ca0 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -576,7 +576,6 @@ CONFIG_XFRM_USER=m # 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 diff --git a/debian/arch/hppa/config.32 b/debian/arch/hppa/config.32 index cefa35044..76a347ca0 100644 --- a/debian/arch/hppa/config.32 +++ b/debian/arch/hppa/config.32 @@ -576,7 +576,6 @@ CONFIG_XFRM_USER=m # 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 diff --git a/debian/arch/hppa/config.32-smp b/debian/arch/hppa/config.32-smp index d0751ba3f..06987922b 100644 --- a/debian/arch/hppa/config.32-smp +++ b/debian/arch/hppa/config.32-smp @@ -580,7 +580,6 @@ CONFIG_XFRM_USER=m # 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 diff --git a/debian/arch/hppa/config.64 b/debian/arch/hppa/config.64 index e45b4ac52..a91b9cf86 100644 --- a/debian/arch/hppa/config.64 +++ b/debian/arch/hppa/config.64 @@ -574,7 +574,6 @@ CONFIG_XFRM_USER=m # 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 diff --git a/debian/arch/hppa/config.64-smp b/debian/arch/hppa/config.64-smp index 684dd9925..ed9096ea0 100644 --- a/debian/arch/hppa/config.64-smp +++ b/debian/arch/hppa/config.64-smp @@ -578,7 +578,6 @@ CONFIG_XFRM_USER=m # 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 diff --git a/debian/arch/i386/config b/debian/arch/i386/config index bb62b0293..cf1ab429a 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -624,8 +624,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index a13a3e665..7a19e051f 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -463,7 +463,6 @@ CONFIG_IP_SCTP=m 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 diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index 6d584ef64..0f318eb2a 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -433,7 +433,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/m68k/config.amiga b/debian/arch/m68k/config.amiga index 6d584ef64..0f318eb2a 100644 --- a/debian/arch/m68k/config.amiga +++ b/debian/arch/m68k/config.amiga @@ -433,7 +433,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/m68k/config.atari b/debian/arch/m68k/config.atari index b943bdee7..529cee798 100644 --- a/debian/arch/m68k/config.atari +++ b/debian/arch/m68k/config.atari @@ -390,7 +390,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/m68k/config.bvme6000 b/debian/arch/m68k/config.bvme6000 index 12dfa0b91..ae7667042 100644 --- a/debian/arch/m68k/config.bvme6000 +++ b/debian/arch/m68k/config.bvme6000 @@ -364,7 +364,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/m68k/config.hp b/debian/arch/m68k/config.hp index 517a68db1..47ea35bf8 100644 --- a/debian/arch/m68k/config.hp +++ b/debian/arch/m68k/config.hp @@ -361,7 +361,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/m68k/config.mac b/debian/arch/m68k/config.mac index df6d5027d..b91700033 100644 --- a/debian/arch/m68k/config.mac +++ b/debian/arch/m68k/config.mac @@ -397,7 +397,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/m68k/config.mvme147 b/debian/arch/m68k/config.mvme147 index 462d60969..a02b4969c 100644 --- a/debian/arch/m68k/config.mvme147 +++ b/debian/arch/m68k/config.mvme147 @@ -361,7 +361,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/m68k/config.mvme16x b/debian/arch/m68k/config.mvme16x index b5367e67b..e517b9a7e 100644 --- a/debian/arch/m68k/config.mvme16x +++ b/debian/arch/m68k/config.mvme16x @@ -364,7 +364,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/m68k/config.q40 b/debian/arch/m68k/config.q40 index 27fea8c8e..eeaec8b04 100644 --- a/debian/arch/m68k/config.q40 +++ b/debian/arch/m68k/config.q40 @@ -407,7 +407,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/m68k/config.sun3 b/debian/arch/m68k/config.sun3 index dabdc9313..197224d5a 100644 --- a/debian/arch/m68k/config.sun3 +++ b/debian/arch/m68k/config.sun3 @@ -348,7 +348,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index d907ddad4..e999b1c3d 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -387,8 +387,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/s390/config b/debian/arch/s390/config index ecd4f0939..35ce9a8a0 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -169,7 +169,6 @@ CONFIG_IP_SCTP=m # 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 diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index f12b585a2..55b3aa7c6 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -209,7 +209,6 @@ CONFIG_BRIDGE_EBT_SNAT=m 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 diff --git a/debian/changelog b/debian/changelog index 9444dbb9c..4d4e905f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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) + + -- Andres Salomon Wed, 17 Aug 2005 00:45:53 -0400 + linux-2.6 (2.6.12-5) unstable; urgency=low * Change ARM to use GCC 3.3 to avoid FTBFS errors with GCC 4