oxnas: sync kernel config-4.1 with changes made to config-4.4

[oweals/openwrt.git] / target / linux / zynq / config-4.4

diff --git a/target/linux/zynq/config-4.4 b/target/linux/zynq/config-4.4
index 719d4e8fe420bcebd0178387d8e8fd07571863e0..f8e080d5f95cfa59a7faa995668df61f1b915564 100644 (file)
--- a/target/linux/zynq/config-4.4
+++ b/target/linux/zynq/config-4.4
@@ -360,12 +360,6 @@ CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_TRIGGERED_BUFFER=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_LRO=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_INPUT=y
 CONFIG_INPUT_EVDEV=y
@@ -415,7 +409,6 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y
 CONFIG_LIBFDT=y
 CONFIG_LOCKD=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_LOG_BUF_SHIFT=14
 CONFIG_MACB=y
 CONFIG_MARVELL_PHY=y
 CONFIG_MDIO_BITBANG=y
@@ -626,7 +619,6 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 CONFIG_SND_SPI=y
 CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SOCK_DIAG=y
 CONFIG_SOC_BUS=y
 CONFIG_SOUND=y
 CONFIG_SPARSE_IRQ=y