resync kernel configuration

SVN-Revision: 18003

diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default
index fff7c9aca879feb41f07bae2e6775d2c9a73d22c..6f18b30569c178fdcbb679d461e12132f4e26612 100644 (file)
--- a/target/linux/octeon/config-default
+++ b/target/linux/octeon/config-default
@@ -145,20 +145,9 @@ CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_I2C is not set
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_RARP=y
 CONFIG_IRQ_CPU=y
 CONFIG_IRQ_CPU_OCTEON=y
 CONFIG_IRQ_PER_CPU=y