r3972 - in people/waldi/kernel/source/linux-2.6/debian/arch: . alpha amd64 i386 powerpc

[Bastian Blank]

Author: waldi
Date: 2005-08-18 18:50:08 +0000 (Thu, 18 Aug 2005)
New Revision: 3972

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/config
   people/waldi/kernel/source/linux-2.6/debian/arch/i386/config
   people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config
Log:
debian/arch/alpha/config, debian/arch/amd64/config, debian/arch/config,
debian/arch/i386/config, debian/arch/powerpc/config: Aggregate ATM options.


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-18 18:02:08 UTC (rev 3971)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/alpha/config	2005-08-18 18:50:08 UTC (rev 3972)
@@ -508,11 +508,6 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=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
@@ -819,7 +814,6 @@
 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-18 18:02:08 UTC (rev 3971)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/amd64/config	2005-08-18 18:50:08 UTC (rev 3972)
@@ -528,11 +528,6 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=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
@@ -794,7 +789,6 @@
 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/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/config	2005-08-18 18:02:08 UTC (rev 3971)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/config	2005-08-18 18:50:08 UTC (rev 3972)
@@ -180,3 +180,9 @@
 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/i386/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/i386/config	2005-08-18 18:02:08 UTC (rev 3971)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/i386/config	2005-08-18 18:50:08 UTC (rev 3972)
@@ -624,11 +624,6 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=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
@@ -946,7 +941,6 @@
 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/powerpc/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config	2005-08-18 18:02:08 UTC (rev 3971)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config	2005-08-18 18:50:08 UTC (rev 3972)
@@ -387,11 +387,6 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SCTP_HMAC_MD5=y
-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
@@ -647,7 +642,6 @@
 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