summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-04-30 08:32:29 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-04-30 08:32:29 -0400
commitc2b217b23eff35e6d4ce8d353705e9323787dff7 (patch)
tree3e51fbe8f296fcf7d7fefc14cc570acfdca67fb2 /config-generic
parent4894d6ca8866c61b6a8e2a9fd2dbbcef0bddf15e (diff)
downloadkernel-c2b217b23eff35e6d4ce8d353705e9323787dff7.tar.gz
kernel-c2b217b23eff35e6d4ce8d353705e9323787dff7.tar.xz
kernel-c2b217b23eff35e6d4ce8d353705e9323787dff7.zip
Linux v3.9-3143-g56847d8
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic4
1 files changed, 4 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 6ef80f2f8..3e96d3694 100644
--- a/config-generic
+++ b/config-generic
@@ -2398,6 +2398,7 @@ CONFIG_SENSORS_MAX197=m
# CONFIG_PCH_PHUB is not set
# CONFIG_SERIAL_PCH_UART is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_SRAM is not set
CONFIG_SERIAL_ARC=m
CONFIG_SERIAL_ARC_NR_PORTS=1
# CONFIG_SERIAL_RP2 is not set
@@ -4268,6 +4269,7 @@ CONFIG_SND_INDIGODJX=m
CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
+CONFIG_BOUNCE=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_AMS_DELTA is not set
@@ -4327,12 +4329,14 @@ CONFIG_DYNAMIC_FTRACE=y
CONFIG_SCHED_TRACER=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_FTRACE_SYSCALLS=y
CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_TRACE_BRANCH_PROFILING is not set
CONFIG_FUNCTION_PROFILER=y
CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
# CONFIG_RBTREE_TEST is not set
# CONFIG_INTERVAL_TREE_TEST is not set
CONFIG_FUNCTION_TRACER=y