summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvbox <vbox at vbox dot at>2011-12-23 22:31:36 +0100
committervbox <vbox at vbox dot at>2011-12-23 22:31:36 +0100
commitd4582ebdd93569a40cba5921426ac201018e7eef (patch)
tree540969b924b28bc5dcec4f56180e747d65c44a43
parentf1753ff199e3cc61e894c11f05488bb27b20d74b (diff)
downloadnutyx-pakxe-d4582ebdd93569a40cba5921426ac201018e7eef.tar.gz
nutyx-pakxe-d4582ebdd93569a40cba5921426ac201018e7eef.tar.bz2
nutyx-pakxe-d4582ebdd93569a40cba5921426ac201018e7eef.tar.xz
nutyx-pakxe-d4582ebdd93569a40cba5921426ac201018e7eef.zip
kernel, maj 3.1.6-2
-rw-r--r--base/kernel/config_648
1 files changed, 6 insertions, 2 deletions
diff --git a/base/kernel/config_64 b/base/kernel/config_64
index 15890961a..7c64f836e 100644
--- a/base/kernel/config_64
+++ b/base/kernel/config_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.3 Kernel Configuration
+# Linux/x86_64 3.1.6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -613,7 +613,10 @@ CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_MULTIPATH=y
CONFIG_IP_ROUTE_VERBOSE=y
CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m
@@ -5225,6 +5228,7 @@ CONFIG_NFS_V4_1=y
CONFIG_PNFS_FILE_LAYOUT=y
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_ROOT_NFS=y
CONFIG_NFS_USE_LEGACY_DNS=y
CONFIG_NFS_USE_NEW_IDMAPPER=y
CONFIG_NFSD=m