From 430706b81d2ec41e2118bba5fbe0702a7950077d Mon Sep 17 00:00:00 2001
From: Abraham Arce <x0066660@ti.com>
Date: Fri, 14 May 2010 12:05:26 -0700
Subject: [PATCH] --- yaml --- r: 196181 b: refs/heads/master c:
 2e5f51a539194406566968d1b68f0bcd1112720d h: refs/heads/master i:   196179:
 fb676bd3341e8967d30b07a8288f8a9c699d6594 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/configs/omap_4430sdp_defconfig | 57 ++++++++++++++++++-
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4d41a41774b1..7b5db30d7d7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2aa5e5757b2fd33c47fc52dfd6d5b0dbcda6492
+refs/heads/master: 2e5f51a539194406566968d1b68f0bcd1112720d
diff --git a/trunk/arch/arm/configs/omap_4430sdp_defconfig b/trunk/arch/arm/configs/omap_4430sdp_defconfig
index a96bca290cd1..d87a349ed6f7 100644
--- a/trunk/arch/arm/configs/omap_4430sdp_defconfig
+++ b/trunk/arch/arm/configs/omap_4430sdp_defconfig
@@ -343,7 +343,34 @@ CONFIG_BINFMT_MISC=y
 #
 # CONFIG_PM is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_NET is not set
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_XFRM=y
+CONFIG_INET=y
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_IPV6 is not set
+
+#
+# Network testing
+#
+# CONFIG_WIRELESS is not set
+
 
 #
 # Device Drivers
@@ -386,6 +413,13 @@ CONFIG_HAVE_IDE=y
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 # CONFIG_PHONE is not set
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_KS8851=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
 
 #
 # Input device support
@@ -457,7 +491,13 @@ CONFIG_HW_RANDOM=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 # CONFIG_I2C is not set
-# CONFIG_SPI is not set
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_OMAP24XX=y
 
 #
 # PPS support
@@ -634,6 +674,19 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
 
 #
 # Partition Types