X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fkernel_configs%2Fkernel-3.0-3.0-sles11-x86_64.config;h=8acf135072e7228fb4e6fb11782d3770d1eb1602;hp=bd2c632bdfcf757feedfe11a840ac4440da59c9b;hb=eac65482534707983dab4e319b165c8ebc2977be;hpb=c4faab9d603055d81e2c53a7fdfaf8d2960c477f;ds=sidebyside

diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config
index bd2c632..8acf135 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 3.0.80 Kernel Configuration
+# Linux/x86_64 3.0.101 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -66,7 +66,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-0.7-default"
+CONFIG_LOCALVERSION="-0.7.15-default"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -649,10 +649,7 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
+# CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m