[kernel] r7861 - in dists/sid/linux-2.6/debian: . arch/arm

[Martin Michlmayr]

Author: tbm
Date: Mon Nov 20 10:40:15 2006
New Revision: 7861

Modified:
   dists/sid/linux-2.6/debian/arch/arm/config.iop32x
   dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/sid/linux-2.6/debian/changelog
Log:
more atm stuff on arm


Modified: dists/sid/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.iop32x	Mon Nov 20 10:40:15 2006
@@ -396,6 +396,12 @@
 #
 # CONFIG_TIPC is not set
 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_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_DECNET=m
@@ -935,6 +941,7 @@
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y

Modified: dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	Mon Nov 20 10:40:15 2006
@@ -425,6 +425,12 @@
 CONFIG_TIPC_LOG=0
 # CONFIG_TIPC_DEBUG is not set
 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_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_DECNET=m
@@ -891,6 +897,7 @@
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Nov 20 10:40:15 2006
@@ -52,7 +52,8 @@
 
   [ Martin Michlmayr ]
   * arm: Set CONFIG_BINFMT_MISC=m
-  * arm/ixp4xx: Set CONFIG_ATM=m so CONFIG_USB_ATM has an effect.
+  * arm/ixp4xx: Set CONFIG_ATM=m (and related modules) so CONFIG_USB_ATM has
+    an effect.
   * arm/iop32x: Likewise.
   * arm/s3c2410: Unset CONFIG_PM_LEGACY.
   * arm/versatile: Fix Versatile PCI config byte accesses