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

[Ben Hutchings]

Author: benh
Date: Sat Dec 22 15:10:18 2012
New Revision: 19634

Log:
[i386,alpha] media/radio: Enable V4L_RADIO_ISA_DRIVERS and re-enable the ISA drivers

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/alpha/config
   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:42:31 2012	(r19633)
+++ dists/trunk/linux/debian/changelog	Sat Dec 22 15:10:18 2012	(r19634)
@@ -25,6 +25,8 @@
     - 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
+  * [i386,alpha] media/radio: Enable V4L_RADIO_ISA_DRIVERS and re-enable
+    the ISA drivers
 
  -- maximilian attems <maks at debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 

Modified: dists/trunk/linux/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux/debian/config/alpha/config	Sat Dec 22 14:42:31 2012	(r19633)
+++ dists/trunk/linux/debian/config/alpha/config	Sat Dec 22 15:10:18 2012	(r19634)
@@ -415,6 +415,7 @@
 ##
 CONFIG_USB_DSBR=m
 CONFIG_RADIO_MAXIRADIO=m
+CONFIG_V4L_RADIO_ISA_DRIVERS=y
 CONFIG_RADIO_CADET=m
 CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m

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:42:31 2012	(r19633)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32	Sat Dec 22 15:10:18 2012	(r19634)
@@ -199,6 +199,7 @@
 ##
 ## file: drivers/media/radio/Kconfig
 ##
+CONFIG_V4L_RADIO_ISA_DRIVERS=y
 CONFIG_RADIO_CADET=m
 CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m