Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/defconfig |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff -puN arch/x86_64/defconfig~x86_64-defconfig-update arch/x86_64/defconfig
--- devel/arch/x86_64/defconfig~x86_64-defconfig-update	2005-09-07 20:10:22.000000000 -0700
+++ devel-akpm/arch/x86_64/defconfig	2005-09-07 20:10:22.000000000 -0700
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc6-git3
-# Fri Aug 12 16:40:34 2005
+# Linux kernel version: 2.6.13
+# Fri Sep  2 21:55:16 2005
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -234,7 +234,10 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_IP_MROUTE is not set
@@ -1074,6 +1077,7 @@ CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
 CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
_