aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2016-07-18 18:59:53 +0200
committerDaniel Golle <daniel@makrotopia.org>2016-07-18 18:59:53 +0200
commitb05125c775009bf495dffd6106a5d5b1ffa01be2 (patch)
treed35194252b046fd53ff19729757521f2d855998c /target/linux
parentcaf36d199d9e6b126c266cf3646af86be9617b07 (diff)
downloadupstream-b05125c775009bf495dffd6106a5d5b1ffa01be2.tar.gz
upstream-b05125c775009bf495dffd6106a5d5b1ffa01be2.tar.bz2
upstream-b05125c775009bf495dffd6106a5d5b1ffa01be2.zip
oxnas: sync kernel config-4.1 with changes made to config-4.4
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/oxnas/config-4.18
1 files changed, 1 insertions, 7 deletions
diff --git a/target/linux/oxnas/config-4.1 b/target/linux/oxnas/config-4.1
index 29c194cfb4..0f3d7984d8 100644
--- a/target/linux/oxnas/config-4.1
+++ b/target/linux/oxnas/config-4.1
@@ -86,7 +86,7 @@ CONFIG_DEBUG_LL=y
CONFIG_DEBUG_LL_INCLUDE="debug/icedcc.S"
# CONFIG_DEBUG_UART_8250 is not set
# CONFIG_DEBUG_USER is not set
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=8
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=16
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DIRECT_IO=y
CONFIG_DMADEVICES=y
@@ -179,9 +179,6 @@ CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_ICPLUS_PHY=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INET_UDP_DIAG=y
CONFIG_INPUT=y
# CONFIG_INPUT_MISC is not set
CONFIG_IOMMU_API=y
@@ -245,7 +242,6 @@ CONFIG_MTD_UBI_BLOCK=y
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UIMAGE_SPLIT=y
CONFIG_MULTI_IRQ_HANDLER=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y
@@ -273,7 +269,6 @@ CONFIG_OF_PCI_IRQ=y
CONFIG_OF_RESERVED_MEM=y
CONFIG_OLD_SIGACTION=y
CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_PACKET_DIAG=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PCI=y
@@ -336,7 +331,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SMP=y
CONFIG_SMP_ON_UP=y
-CONFIG_SOCK_DIAG=y
CONFIG_SRCU=y
CONFIG_STMMAC_ETH=y
CONFIG_STMMAC_PLATFORM=y