[linux] 01/12: media: Enable VIDEO_TW5864, VIDEO_TW686X as modules

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 5ed69967a23fc4455ba02b86b2d537d3b56fc322
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue May 2 03:26:54 2017 +0100

    media: Enable VIDEO_TW5864, VIDEO_TW686X as modules
---
 debian/changelog     |  1 +
 debian/config/config | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 810140e..a0d6fde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -368,6 +368,7 @@ linux (4.9.25-1) UNRELEASED; urgency=medium
   * integrity: Enable IMA, IMA_DEFAULT_HASH_SHA256, IMA_APPRAISE,
     IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY, IMA_BLACKLIST_KEYRING
     (except on armel/marvell) (Closes: #788290)
+  * media: Enable VIDEO_TW5864, VIDEO_TW686X as modules
 
   [ Salvatore Bonaccorso ]
   * ping: implement proper locking (CVE-2017-2671)
diff --git a/debian/config/config b/debian/config/config
index f4e4252..bb38e16 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1935,11 +1935,21 @@ CONFIG_DVB_BUDGET_AV=m
 CONFIG_DVB_BUDGET_PATCH=m
 
 ##
+## file: drivers/media/pci/tw5864/Kconfig
+##
+CONFIG_VIDEO_TW5864=m
+
+##
 ## file: drivers/media/pci/tw68/Kconfig
 ##
 CONFIG_VIDEO_TW68=m
 
 ##
+## file: drivers/media/pci/tw686x/Kconfig
+##
+CONFIG_VIDEO_TW686X=m
+
+##
 ## file: drivers/media/pci/zoran/Kconfig
 ##
 CONFIG_VIDEO_ZORAN=m

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git