aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2014-09-07 16:56:57 +0000
committerBen Hutchings <benh@debian.org>2014-09-07 16:56:57 +0000
commitc0a5828ab2efa16a3a7b624a840d03a79cb607f2 (patch)
tree12b1e03ecbe9602ccb0fc7a1e36f9b431402448f
parent5dea0d3a05ff8d8f8941051e15d12f1c06aaf4ea (diff)
downloadkernel_replicant_linux-c0a5828ab2efa16a3a7b624a840d03a79cb607f2.tar.gz
kernel_replicant_linux-c0a5828ab2efa16a3a7b624a840d03a79cb607f2.tar.bz2
kernel_replicant_linux-c0a5828ab2efa16a3a7b624a840d03a79cb607f2.zip
[i386] comedi: Enable COMEDI_DAC02 as module, replacing COMEDI_POC
svn path=/dists/trunk/linux/; revision=21770
-rw-r--r--debian/changelog1
-rw-r--r--debian/config/kernelarch-x86/config-arch-321
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a71a6f7c5304..e5183f115d7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ linux (3.16.2-1) UNRELEASED; urgency=medium
* mtd: Enable MTD_SPI_NOR as module, since M25P80 now depends on it
* [m68k] Enable CGROUPS, required by systemd
* [armhf] Re-enable SPI_IMX as module
+ * [i386] comedi: Enable COMEDI_DAC02 as module, replacing COMEDI_POC
[ Vagrant Cascadian ]
* [armmp] Enable IMX_IPUV3_CORE (closes: #756810).
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index 1fe657cc8ca2..521d7885a834 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -382,6 +382,7 @@ CONFIG_COMEDI_PCL818=m
CONFIG_COMEDI_PCM3724=m
CONFIG_COMEDI_RTI800=m
CONFIG_COMEDI_RTI802=m
+CONFIG_COMEDI_DAC02=m
CONFIG_COMEDI_DAS16M1=m
CONFIG_COMEDI_DAS16=m
CONFIG_COMEDI_DAS800=m