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

[Maximilian Attems]

Author: maks
Date: Sun May  1 14:09:44 2011
New Revision: 17281

Log:
x86: enable EASYCAP

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	Sun May  1 13:39:35 2011	(r17280)
+++ dists/trunk/linux-2.6/debian/changelog	Sun May  1 14:09:44 2011	(r17281)
@@ -1,6 +1,7 @@
 linux-2.6 (2.6.39~rc5-1~experimental.2) experimental; urgency=low
 
   * Enable SQUASHFS_{LZO,XZ}. (closes: #613658)
+  * [x86] Enable EASYCAP. (closes: #624505)
 
  -- maximilian attems <maks at debian.org>  Tue, 01 May 2011 14:36:33 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun May  1 13:39:35 2011	(r17280)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun May  1 14:09:44 2011	(r17281)
@@ -1093,6 +1093,11 @@
 CONFIG_COMEDI_USB_DRIVERS=m
 
 ##
+## file: drivers/staging/easycap/Kconfig
+##
+CONFIG_EASYCAP=m
+
+##
 ## file: drivers/staging/et131x/Kconfig
 ##
 CONFIG_ET131X=m