aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-10-05 20:17:40 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-10-05 20:17:40 +0000
commita5ddf265dd6e597bbed9d7adde3726f1fdeb9f5d (patch)
treee522b410c324a5c0b911eac59431f589eb867b0d /target/linux/octeon
parent77a1709fc64c0db41c587adb423de86abd49ed03 (diff)
downloadupstream-a5ddf265dd6e597bbed9d7adde3726f1fdeb9f5d.tar.gz
upstream-a5ddf265dd6e597bbed9d7adde3726f1fdeb9f5d.tar.bz2
upstream-a5ddf265dd6e597bbed9d7adde3726f1fdeb9f5d.zip
[octeon] resync kernel config, do not enable security options
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17934 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/octeon')
-rw-r--r--target/linux/octeon/config-default12
1 files changed, 1 insertions, 11 deletions
diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default
index 5cbc61fc82..fff7c9aca8 100644
--- a/target/linux/octeon/config-default
+++ b/target/linux/octeon/config-default
@@ -99,8 +99,6 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_WRITECOUNT is not set
CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_DEVKMEM=y
@@ -147,7 +145,6 @@ CONFIG_HZ=250
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_I2C is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
CONFIG_INET_XFRM_MODE_BEET=y
@@ -190,6 +187,7 @@ CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_N32=y
CONFIG_MIPS32_O32=y
# CONFIG_MIPS_COBALT is not set
+# CONFIG_MIPS_FPU_EMU is not set
CONFIG_MIPS_L1_CACHE_SHIFT=7
# CONFIG_MIPS_MACHINE is not set
# CONFIG_MIPS_MALTA is not set
@@ -202,7 +200,6 @@ CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
# CONFIG_NATSEMI is not set
-# CONFIG_NETLABEL is not set
# CONFIG_NETWORK_FILESYSTEMS is not set
# CONFIG_NO_IOPORT is not set
CONFIG_NR_CPUS=16
@@ -229,7 +226,6 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_PROC_PAGE_MONITOR=y
-
# CONFIG_PROVE_LOCKING is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RELAY=y
@@ -242,12 +238,6 @@ CONFIG_SCHED_DEBUG=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
CONFIG_SECCOMP=y
-CONFIG_SECURITY=y
-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-# CONFIG_SECURITY_PATH is not set
-# CONFIG_SECURITY_TOMOYO is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
# CONFIG_SGI_IP22 is not set
# CONFIG_SGI_IP27 is not set