aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2015-05-26 00:49:19 +0000
committerBen Hutchings <benh@debian.org>2015-05-26 00:49:19 +0000
commitdfbc65af1c3d5e076c50afd5d91277bf80bd2672 (patch)
tree19845d47e6bfebc5c4347f3e40007cf9db620a36
parentb9534651085771343951fc928641c803bd7ecbad (diff)
downloadkernel_replicant_linux-dfbc65af1c3d5e076c50afd5d91277bf80bd2672.tar.gz
kernel_replicant_linux-dfbc65af1c3d5e076c50afd5d91277bf80bd2672.tar.bz2
kernel_replicant_linux-dfbc65af1c3d5e076c50afd5d91277bf80bd2672.zip
media: Enable DVB_SMIPCIE as module (Closes: #785153)
svn path=/dists/sid/linux/; revision=22708
-rw-r--r--debian/changelog1
-rw-r--r--debian/config/config5
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 83ea4a5c6157..e58597604202 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,6 +98,7 @@ linux (4.0.4-1) UNRELEASED; urgency=medium
DEBUG_MVEBU_UART_ALTERNATE
* i2o: Disable I2O
* [x86] vmwgfx: Enable DRM_VMWGFX_FBCON (Closes: #714929)
+ * media: Enable DVB_SMIPCIE as module (Closes: #785153)
[ Ian Campbell ]
* [armhf+arm64] Enabled generic SYSCON regmap reset driver
diff --git a/debian/config/config b/debian/config/config
index 62dbadc0a4e6..249e24085c0a 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1680,6 +1680,11 @@ CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_SAA7164=m
##
+## file: drivers/media/pci/smipcie/Kconfig
+##
+CONFIG_DVB_SMIPCIE=m
+
+##
## file: drivers/media/pci/solo6x10/Kconfig
##
CONFIG_VIDEO_SOLO6X10=m