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

[Ben Hutchings]

Author: benh
Date: Sat Dec 22 14:42:31 2012
New Revision: 19633

Log:
[i386] comedi: Re-enable COMEDI_ISA_DRIVERS

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Dec 22 14:24:00 2012	(r19632)
+++ dists/trunk/linux/debian/changelog	Sat Dec 22 14:42:31 2012	(r19633)
@@ -24,6 +24,7 @@
     - Enable SOC_IMX53, replacing MACH_MX53_{EVK,SMD,LOCO,ARD}
     - Re-enable MFD_MC13XXX_SPI (formerly included in MFD_MC13XXX)
     - Enable PWM and re-enable PWM_IMX (formerly known as MXC_PWM)
+  * [i386] comedi: Re-enable COMEDI_ISA_DRIVERS
 
  -- maximilian attems <maks at debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32	Sat Dec 22 14:24:00 2012	(r19632)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32	Sat Dec 22 14:42:31 2012	(r19633)
@@ -402,7 +402,7 @@
 ##
 ## file: drivers/staging/comedi/Kconfig
 ##
-CONFIG_COMEDI_ISA_DRIVERS=m
+CONFIG_COMEDI_ISA_DRIVERS=y
 CONFIG_COMEDI_ACL7225B=m
 CONFIG_COMEDI_PCL711=m
 CONFIG_COMEDI_PCL724=m