[PATCH] config: for the XS role - enable bonding and build MMC/SD statically

[Martin Langhoff]

With the MMC/SD drivers built statically we boot without initrd
(which sidesteps problems with the F9 initrd).

The network infra on the XS uses bonding extensively, so build
it as a module.

---

Not sure who's maintaining the OLPC kernel these days. With this trivial
patch our latest released kernel becomes usable for the XS-on-XO as well.

If the changes are acceptable for our 'mainstream' kernel and we can use
the same kernel it keeps things nice and simple from a maintenance and
testing PoV.

---
 arch/x86/configs/olpc_defconfig |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/configs/olpc_defconfig b/arch/x86/configs/olpc_defconfig
index 51d3bd7..ca4188d 100644
--- a/arch/x86/configs/olpc_defconfig
+++ b/arch/x86/configs/olpc_defconfig
@@ -893,7 +893,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_NETDEVICES_MULTIQUEUE is not set
 CONFIG_IFB=m
 CONFIG_DUMMY=m
-# CONFIG_BONDING is not set
+CONFIG_BONDING=m
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
@@ -1763,21 +1763,21 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
-CONFIG_MMC=m
+CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y
 
 #
 # MMC/SD Card Drivers
 #
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
 
 #
 # MMC/SD Host Controller Drivers
 #
-CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI=y
 # CONFIG_MMC_RICOH_MMC is not set
 # CONFIG_MMC_WBSD is not set
 # CONFIG_MMC_TIFM_SD is not set
-- 
1.5.6.6