diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-01-17 10:41:52 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-17 10:41:52 +0000 |
commit | cad399c87b7739c4b8eeb4119706860818f7d84f (patch) | |
tree | c76f6fa265763d9694265b0725ffb9c3e9d7f9c3 /target/linux/uml/config | |
parent | 7c0260117f88e4db84701af86bf1668223c52024 (diff) | |
download | openwrt-cad399c87b7739c4b8eeb4119706860818f7d84f.tar.gz openwrt-cad399c87b7739c4b8eeb4119706860818f7d84f.tar.bz2 openwrt-cad399c87b7739c4b8eeb4119706860818f7d84f.zip |
uml: update to linux 4.4
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48265
Diffstat (limited to 'target/linux/uml/config')
-rw-r--r-- | target/linux/uml/config/i386 | 6 | ||||
-rw-r--r-- | target/linux/uml/config/x86_64 | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386 index 9521706346..6893ee02fa 100644 --- a/target/linux/uml/config/i386 +++ b/target/linux/uml/config/i386 @@ -55,7 +55,6 @@ CONFIG_HAVE_NET_DSA=y CONFIG_HAVE_UID16=y CONFIG_HOSTAUDIO=m CONFIG_HOSTFS=y -# CONFIG_HPPFS is not set CONFIG_HZ_PERIODIC=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INIT_ENV_ARG_LIMIT=128 @@ -105,9 +104,9 @@ CONFIG_NO_DMA=y CONFIG_NO_IOMEM=y # CONFIG_NSC_GPIO is not set CONFIG_NULL_CHAN=y +# CONFIG_OF is not set CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y -CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PORT_CHAN=y CONFIG_POSIX_MQUEUE=y @@ -128,6 +127,7 @@ CONFIG_RD_GZIP=y CONFIG_RELAY=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_SBC8360_WDT is not set +# CONFIG_SCHED_INFO is not set # CONFIG_SCSI_DMA is not set CONFIG_SOFT_WATCHDOG=m CONFIG_SOUND=m @@ -140,10 +140,10 @@ CONFIG_SSL_CHAN="pty" CONFIG_STACKTRACE=y CONFIG_STATIC_LINK=y CONFIG_STDERR_CONSOLE=y +# CONFIG_SUNXI_SRAM is not set CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set CONFIG_TTY_CHAN=y -CONFIG_UID16=y CONFIG_UML=y CONFIG_UML_NET=y CONFIG_UML_NET_DAEMON=y diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64 index be25a2ea51..29ef1c11ae 100644 --- a/target/linux/uml/config/x86_64 +++ b/target/linux/uml/config/x86_64 @@ -56,7 +56,6 @@ CONFIG_HAVE_UID16=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HOSTAUDIO=m CONFIG_HOSTFS=y -# CONFIG_HPPFS is not set CONFIG_HZ_PERIODIC=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INIT_ENV_ARG_LIMIT=128 @@ -84,7 +83,7 @@ CONFIG_NLS=y CONFIG_NO_DMA=y CONFIG_NO_IOMEM=y CONFIG_NULL_CHAN=y -CONFIG_PAGEFLAGS_EXTENDED=y +# CONFIG_OF is not set CONFIG_PGTABLE_LEVELS=3 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_PORT_CHAN=y @@ -106,6 +105,7 @@ CONFIG_RD_GZIP=y CONFIG_RELAY=y # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_SCHED_INFO is not set # CONFIG_SCSI_DMA is not set CONFIG_SOFT_WATCHDOG=m CONFIG_SOUND=m @@ -118,10 +118,10 @@ CONFIG_SSL_CHAN="pty" CONFIG_STACKTRACE=y CONFIG_STATIC_LINK=y CONFIG_STDERR_CONSOLE=y +# CONFIG_SUNXI_SRAM is not set CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set CONFIG_TTY_CHAN=y -CONFIG_UID16=y CONFIG_UML=y CONFIG_UML_NET=y CONFIG_UML_NET_DAEMON=y @@ -137,7 +137,6 @@ CONFIG_UML_RANDOM=y CONFIG_UML_SOUND=m CONFIG_UML_WATCHDOG=m CONFIG_UML_X86=y -# CONFIG_UNISYSSPAR is not set # CONFIG_USER_NS is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_WATCHDOG_CORE=y |