aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/config-3.10
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-08-23 17:31:02 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-08-23 17:31:02 +0000
commit6f232cba6241c248000fbca5e7261c1a79accbb4 (patch)
tree921fc106fb691fe3ec7cbe4d28ecc8cae10b93a0 /target/linux/generic/config-3.10
parenta76371970e14d1865e0035a568ed75e3ce37f864 (diff)
downloadupstream-6f232cba6241c248000fbca5e7261c1a79accbb4.tar.gz
upstream-6f232cba6241c248000fbca5e7261c1a79accbb4.tar.bz2
upstream-6f232cba6241c248000fbca5e7261c1a79accbb4.zip
generic: refresh kernel configs with kconfig.pl
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37831
Diffstat (limited to 'target/linux/generic/config-3.10')
-rw-r--r--target/linux/generic/config-3.105
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10
index 943c217c8e..443703961e 100644
--- a/target/linux/generic/config-3.10
+++ b/target/linux/generic/config-3.10
@@ -966,7 +966,6 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_IRQ_PROBE=y
-# CONFIG_PWM is not set
CONFIG_GENERIC_TIME=y
# CONFIG_GFS2_FS is not set
# CONFIG_GIGASET_CAPI is not set
@@ -3412,11 +3411,11 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
# CONFIG_TR is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
# CONFIG_TRACE_BRANCH_PROFILING is not set
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_TRACE_SINK is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_TRACING_SUPPORT=y
CONFIG_TRAD_SIGNALS=y
# CONFIG_TRANSPARENT_HUGEPAGE is not set