[kernel] r7799 - in dists/trunk/linux-2.6/debian: . arch/arm

[Martin Michlmayr]

Author: tbm
Date: Tue Nov 14 23:12:24 2006
New Revision: 7799

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/changelog
Log:
Set CONFIG_ATM=m so CONFIG_USB_ATM has an effect.


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	Tue Nov 14 23:12:24 2006
@@ -395,7 +395,7 @@
 # TIPC Configuration (EXPERIMENTAL)
 #
 # CONFIG_TIPC is not set
-# CONFIG_ATM is not set
+CONFIG_ATM=m
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_DECNET=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Tue Nov 14 23:12:24 2006
@@ -424,7 +424,7 @@
 CONFIG_TIPC_PORTS=8191
 CONFIG_TIPC_LOG=0
 # CONFIG_TIPC_DEBUG is not set
-# CONFIG_ATM is not set
+CONFIG_ATM=m
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_DECNET=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Nov 14 23:12:24 2006
@@ -26,6 +26,8 @@
 
   [ Martin Michlmayr ]
   - arm: Set CONFIG_BINFMT_MISC=m
+  - arm/ixp4xx: Set CONFIG_ATM=m so CONFIG_USB_ATM has an effect.
+  - arm/iop32x: Likewise.
 
   [ dann frazier ]
   * Backport various SCTP changesets from 2.6.19, recommended by Vlad Yasevich