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

[Ben Hutchings]

Author: benh
Date: Thu Oct  7 12:03:46 2010
New Revision: 16411

Log:
[x86] Enable modular TM6000, TM6000_ALSA, TM6000_DVB

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	Thu Oct  7 02:39:06 2010	(r16410)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Oct  7 12:03:46 2010	(r16411)
@@ -3,6 +3,7 @@
   * New upstream release candidate
   * qla4xxx: Fix build on some architectures lacking 64-bit I/O
     (Closes: #598503)
+  * [x86] Enable modular TM6000, TM6000_ALSA, TM6000_DVB
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 07 Oct 2010 03:24:21 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Oct  7 02:39:06 2010	(r16410)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Oct  7 12:03:46 2010	(r16411)
@@ -1148,6 +1148,13 @@
 CONFIG_RTL8192U=m
 
 ##
+## file: drivers/staging/tm6000/Kconfig
+##
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+##
 ## file: drivers/staging/usbip/Kconfig
 ##
 CONFIG_USB_IP_COMMON=m