summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-05-19 09:48:08 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-05-19 09:50:01 -0700
commit39bfc7e6a160dcc72813b7996b41682b5e680393 (patch)
treedb678aa9d6d59ec124f6977de4322d561ddaf61c /config-generic
parentaf495309bb553b4659f08470ac94fedf74b3845a (diff)
downloadkernel-39bfc7e6a160dcc72813b7996b41682b5e680393.tar.gz
kernel-39bfc7e6a160dcc72813b7996b41682b5e680393.tar.xz
kernel-39bfc7e6a160dcc72813b7996b41682b5e680393.zip
Linux v4.6-5028-g2600a46
trace, audit, input, media, scsi, armsoc merges
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 70731ecda..21ac74dae 100644
--- a/config-generic
+++ b/config-generic
@@ -3491,6 +3491,9 @@ CONFIG_VIDEO_TM6000_DVB=m
# CONFIG_VIDEO_VIVID is not set
CONFIG_VIDEO_USBTV=m
# CONFIG_VIDEO_AU0828_RC is not set
+CONFIG_VIDEO_TW686X=m
+# Staging version?
+# CONFIG_VIDEO_TW686X_KH is not set
CONFIG_USB_VIDEO_CLASS=m
CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -5429,6 +5432,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
CONFIG_FUNCTION_TRACER=y
CONFIG_STACK_TRACER=y
# CONFIG_FUNCTION_GRAPH_TRACER is not set
+# CONFIG_HIST_TRIGGERS is not set
CONFIG_KPROBES=y
CONFIG_KPROBE_EVENT=y