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

[Maximilian Attems]

Author: maks
Date: Sat Jul 18 15:48:27 2009
New Revision: 13964

Log:
x86 enable COMEDI_PCMCIA_DRIVERS

centralize the comedi staging setting.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config
   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	Sat Jul 18 15:48:15 2009	(r13963)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Jul 18 15:48:27 2009	(r13964)
@@ -19,7 +19,7 @@
   * Disable v4l1 ov511 and quickcam_messenger drivers.
   * [x86_64] Enable HW_RANDOM_VIA.
   * [x86] Keep divers staging stuff enabled.
-  * [x86] Enable RT3070.
+  * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS.
 
   [ Ben Hutchings ]
   * mga: remove unnecessary change from firmware-loading patch

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Sat Jul 18 15:48:15 2009	(r13963)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Sat Jul 18 15:48:27 2009	(r13964)
@@ -944,14 +944,6 @@
 CONFIG_SERIAL_JSM=m
 
 ##
-## file: drivers/staging/comedi/Kconfig
-##
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-
-##
 ## file: drivers/telephony/Kconfig
 ##
 CONFIG_PHONE=m

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Sat Jul 18 15:48:15 2009	(r13963)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Sat Jul 18 15:48:27 2009	(r13964)
@@ -1114,14 +1114,6 @@
 CONFIG_SERIAL_JSM=m
 
 ##
-## file: drivers/staging/comedi/Kconfig
-##
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-
-##
 ## file: drivers/telephony/Kconfig
 ##
 CONFIG_PHONE=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Jul 18 15:48:15 2009	(r13963)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Jul 18 15:48:27 2009	(r13964)
@@ -213,7 +213,11 @@
 ##
 ## file: drivers/staging/comedi/Kconfig
 ##
-# CONFIG_COMEDI is not set
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=m
 
 ##
 ## file: drivers/staging/dst/Kconfig