[kernel] r18514 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Fri Jan 13 02:15:01 2012
New Revision: 18514

Log:
staging: Enable STAGING_MEDIA, which various drivers now depend on (Closes: #654800)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Jan 13 01:53:05 2012	(r18513)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jan 13 02:15:01 2012	(r18514)
@@ -13,6 +13,8 @@
   * Install /lib/modules/<kernel-version>/modules.builtin in linux-image
     packages
   * [ia64] Add accept4() syscall (Closes: #647825)
+  * staging: Enable STAGING_MEDIA, which various drivers now depend on
+    (Closes: #654800)
 
   [ Bastian Blank ]
   * [amd64] crypt: Enable some amd64 only ciphers.

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Jan 13 01:53:05 2012	(r18513)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Jan 13 02:15:01 2012	(r18514)
@@ -2784,6 +2784,11 @@
 # CONFIG_LINE6_USB is not set
 
 ##
+## file: drivers/staging/media/Kconfig
+##
+CONFIG_STAGING_MEDIA=y
+
+##
 ## file: drivers/staging/media/go7007/Kconfig
 ##
 # CONFIG_VIDEO_GO7007 is not set