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

[Ben Hutchings]

Author: benh
Date: Fri Jan 13 02:21:47 2012
New Revision: 18515

Log:
Limit CONFIG_STAGING_MEDIA to x86

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   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	Fri Jan 13 02:15:01 2012	(r18514)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jan 13 02:21:47 2012	(r18515)
@@ -13,7 +13,7 @@
   * 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
+  * [x86] staging: Enable STAGING_MEDIA, which various drivers now depend on
     (Closes: #654800)
 
   [ Bastian Blank ]

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Jan 13 02:15:01 2012	(r18514)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Jan 13 02:21:47 2012	(r18515)
@@ -2786,12 +2786,7 @@
 ##
 ## file: drivers/staging/media/Kconfig
 ##
-CONFIG_STAGING_MEDIA=y
-
-##
-## file: drivers/staging/media/go7007/Kconfig
-##
-# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_STAGING_MEDIA is not set
 
 ##
 ## file: drivers/staging/panel/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Jan 13 02:15:01 2012	(r18514)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Jan 13 02:21:47 2012	(r18515)
@@ -1308,11 +1308,21 @@
 CONFIG_HYPERV_MOUSE=m
 
 ##
+## file: drivers/staging/media/Kconfig
+##
+CONFIG_STAGING_MEDIA=y
+
+##
 ## file: drivers/staging/media/easycap/Kconfig
 ##
 CONFIG_EASYCAP=m
 
 ##
+## file: drivers/staging/media/go7007/Kconfig
+##
+# CONFIG_VIDEO_GO7007 is not set
+
+##
 ## file: drivers/staging/media/lirc/Kconfig
 ##
 CONFIG_LIRC_STAGING=y