aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-06-10 10:45:51 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-06-10 10:45:51 +0000
commit9bc1e548a19f05e2bafad0461b9ae0b34654cf2a (patch)
tree7d20a4e9607bdc5afa5d457fe96470abd4c63511 /target/linux/generic-2.6
parent4128c72275a86f59e3731f509d7de13d98d7ed96 (diff)
downloadupstream-9bc1e548a19f05e2bafad0461b9ae0b34654cf2a.tar.gz
upstream-9bc1e548a19f05e2bafad0461b9ae0b34654cf2a.tar.bz2
upstream-9bc1e548a19f05e2bafad0461b9ae0b34654cf2a.zip
generic: move more common options to generic configuration
* CONFIG_ABX500_CORE * CONFIG_ATOMIC64_SELFTEST * CONFIG_BRIDGE_IGMP_SNOOPING * CONFIG_CAIF * CONFIG_CEPH_FS * CONFIG_CRYSTALHD * CONFIG_DEFAULT_SECURITY_SELINUX * CONFIG_DEFAULT_SECURITY_SMACK * CONFIG_DEFAULT_SECURITY_TOMOYO * CONFIG_DT3155 * CONFIG_IP_MROUTE_MULTIPLE_TABLES * CONFIG_L2TP * CONFIG_LOGFS * CONFIG_LPC_SCH * CONFIG_MFD_JANZ_CMODIO * CONFIG_MFD_RDC321X * CONFIG_N_GSM * CONFIG_RAMOOPS * CONFIG_SERIAL_ALTERA_JTAGUART * CONFIG_SERIAL_ALTERA_UART * CONFIG_SERIAL_TIMBERDALE * CONFIG_SM_FTL * CONFIG_SQUASHFS_XATTRS SVN-Revision: 21750
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/config-2.6.333
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33
index 664b508ff9..da73284891 100644
--- a/target/linux/generic-2.6/config-2.6.33
+++ b/target/linux/generic-2.6/config-2.6.33
@@ -2897,4 +2897,7 @@ CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_ZONE_DMA=y
CONFIG_DEFAULT_SECURITY_DAC=y
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
CONFIG_DEFAULT_SECURITY=""