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

[Martin Michlmayr]

Author: tbm
Date: Thu Sep 14 08:54:13 2006
New Revision: 7414

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/arch/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/changelog

Log:
Enable CONFIG_BONDING on some mipsel and arm machines


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	Thu Sep 14 08:54:13 2006
@@ -822,7 +822,7 @@
 #
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
-# CONFIG_BONDING is not set
+CONFIG_BONDING=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=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	Thu Sep 14 08:54:13 2006
@@ -792,7 +792,7 @@
 #
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
+CONFIG_BONDING=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	Thu Sep 14 08:54:13 2006
@@ -699,7 +699,7 @@
 #
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
+CONFIG_BONDING=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Sep 14 08:54:13 2006
@@ -9,6 +9,9 @@
   * arm/footbridge: Enable the CIFS module (closes: #274808).
   * arm/nslu2: Drop flavour since this machine is supported by arm/ixp4xx.
   * arm: Make get_unaligned() work with const pointers and GCC 4.1.
+  * mipsel/r5k-cobalt: Enable CONFIG_BONDING as a module.
+  * arm/iop32x: Likewise.
+  * arm/ixp4xx: Likewise.
 
   [ Sven Luther ]
   * [powerpc] Enabled the -prep flavour.