diff --git a/debian/changelog b/debian/changelog index c389445a0..2fec4e807 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ linux-2.6 (3.0.0~rc3-1~experimental.2) UNRELEASED; urgency=low [ Ben Hutchings ] * rt2800pci: Add device ID for RT539F device (Closes: #630960) + * atm: Enable for all architectures except m68k, s390 (Closes: #630900) -- maximilian attems Fri, 17 Jun 2011 16:45:38 +0200 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 99dc435b0..fadf782e7 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1026,17 +1026,6 @@ CONFIG_SUN_PARTITION=y #. TODO CONFIG_CRC32=m -## -## file: net/atm/Kconfig -## -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 - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 41092b530..1e999cae3 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -606,17 +606,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -## -## file: net/atm/Kconfig -## -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 - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index f9b144a83..28ba098fc 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -687,17 +687,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -## -## file: net/atm/Kconfig -## -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 - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/config b/debian/config/config index e8fc8dc3d..11b4729cf 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3727,6 +3727,17 @@ CONFIG_NET_9P_VIRTIO=m CONFIG_NET_9P_RDMA=m # CONFIG_NET_9P_DEBUG is not set +## +## file: net/atm/Kconfig +## +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 + ## ## file: net/batman-adv/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 9021f4259..8a1133481 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -599,11 +599,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -## -## file: net/atm/Kconfig -## -# CONFIG_ATM is not set - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 5f776f6e4..e9dddfe71 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1426,17 +1426,6 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y ## # CONFIG_DEBUG_PAGEALLOC is not set -## -## file: net/atm/Kconfig -## -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 - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index c9ff6fa12..c619e38ef 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1042,17 +1042,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -## -## file: net/atm/Kconfig -## -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 - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 86d36a4a3..df4c1d15e 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1046,17 +1046,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -## -## file: net/atm/Kconfig -## -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 - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index b836ccf6a..c2b15e0e9 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -494,11 +494,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -## -## file: net/atm/Kconfig -## -# CONFIG_ATM is not set - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index bf8197625..0815e1dce 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -719,11 +719,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -## -## file: net/atm/Kconfig -## -# CONFIG_ATM is not set - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index d6e4e7d79..f6cb36e26 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -725,11 +725,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -## -## file: net/atm/Kconfig -## -# CONFIG_ATM is not set - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index d04ea4b8e..7b77fd808 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -650,11 +650,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -## -## file: net/atm/Kconfig -## -# CONFIG_ATM is not set - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index b7f41ef2b..9a3248491 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -827,17 +827,6 @@ CONFIG_EFI_PARTITION=y ## # CONFIG_DEBUG_STACK_USAGE is not set -## -## file: net/atm/Kconfig -## -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 - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index a6e52bbfd..317edbe79 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -508,11 +508,6 @@ CONFIG_EFI_PARTITION=y CONFIG_SPARSEMEM_MANUAL=y ## end choice -## -## file: net/atm/Kconfig -## -# CONFIG_ATM is not set - ## ## file: net/ax25/Kconfig ##