[kernel] r17719 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Tue Jun 21 14:27:16 2011
New Revision: 17719

Log:
x86: enable some comedi modules

guess more will follow..

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Jun 21 13:01:30 2011	(r17718)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jun 21 14:27:16 2011	(r17719)
@@ -1,3 +1,10 @@
+linux-2.6 (3.0.0~rc4-1~experimental.2) UNRELEASED; urgency=low
+
+  [ maximilian attems ]
+  * [x86] enable some comedi modules. (closes: #631199)
+
+ -- maximilian attems <maks at debian.org>  Tue, 21 Jun 2011 15:00:23 +0200
+
 linux-2.6 (3.0.0~rc4-1~experimental.1) experimental; urgency=low
 
   * New upstream release candidate

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jun 21 13:01:30 2011	(r17718)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jun 21 14:27:16 2011	(r17719)
@@ -1081,6 +1081,12 @@
 CONFIG_COMEDI_PCI_DRIVERS=m
 CONFIG_COMEDI_PCMCIA_DRIVERS=m
 CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_NI_COMMON=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_8255=m
 
 ##
 ## file: drivers/staging/easycap/Kconfig