[kernel] r19625 - in dists/trunk/linux/debian: . config/mips config/mipsel config/sparc

[Ben Hutchings]

Author: benh
Date: Sat Dec 22 02:52:54 2012
New Revision: 19625

Log:
[mips,mipsel,sparc] media/parpot: Disable VIDEO_PMS in all configurations where the other parport video drivers are disabled

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/mips/config.r4k-ip22
   dists/trunk/linux/debian/config/mips/config.r5k-ip32
   dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
   dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
   dists/trunk/linux/debian/config/sparc/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Dec 22 02:45:39 2012	(r19624)
+++ dists/trunk/linux/debian/changelog	Sat Dec 22 02:52:54 2012	(r19625)
@@ -11,6 +11,8 @@
   * aufs: Update to aufs3.x-rcN-20121210
   * [rt] Disable until it is updated for Linux 3.7 or later
   * Make gcc-4.7 the default compiler
+  * [mips,mipsel,sparc] media/parpot: Disable VIDEO_PMS in all
+    configurations where the other parport video drivers are disabled
 
  -- maximilian attems <maks at debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 

Modified: dists/trunk/linux/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r4k-ip22	Sat Dec 22 02:45:39 2012	(r19624)
+++ dists/trunk/linux/debian/config/mips/config.r4k-ip22	Sat Dec 22 02:52:54 2012	(r19625)
@@ -263,10 +263,7 @@
 ##
 ## file: drivers/media/parport/Kconfig
 ##
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_W9966 is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
 
 ##
 ## file: drivers/media/platform/Kconfig

Modified: dists/trunk/linux/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r5k-ip32	Sat Dec 22 02:45:39 2012	(r19624)
+++ dists/trunk/linux/debian/config/mips/config.r5k-ip32	Sat Dec 22 02:52:54 2012	(r19625)
@@ -285,9 +285,7 @@
 ##
 ## file: drivers/media/parport/Kconfig
 ##
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_W9966 is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
 
 ##
 ## file: drivers/media/pci/bt8xx/Kconfig

Modified: dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a	Sat Dec 22 02:45:39 2012	(r19624)
+++ dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a	Sat Dec 22 02:52:54 2012	(r19625)
@@ -336,9 +336,7 @@
 ##
 ## file: drivers/media/parport/Kconfig
 ##
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_W9966 is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
 
 ##
 ## file: drivers/media/pci/bt8xx/Kconfig

Modified: dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b	Sat Dec 22 02:45:39 2012	(r19624)
+++ dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b	Sat Dec 22 02:52:54 2012	(r19625)
@@ -342,9 +342,7 @@
 ##
 ## file: drivers/media/parport/Kconfig
 ##
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_W9966 is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
 
 ##
 ## file: drivers/media/pci/bt8xx/Kconfig

Modified: dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt	Sat Dec 22 02:45:39 2012	(r19624)
+++ dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt	Sat Dec 22 02:52:54 2012	(r19625)
@@ -265,9 +265,7 @@
 ##
 ## file: drivers/media/parport/Kconfig
 ##
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_W9966 is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
 
 ##
 ## file: drivers/media/pci/saa7146/Kconfig

Modified: dists/trunk/linux/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux/debian/config/sparc/config	Sat Dec 22 02:45:39 2012	(r19624)
+++ dists/trunk/linux/debian/config/sparc/config	Sat Dec 22 02:52:54 2012	(r19625)
@@ -216,9 +216,7 @@
 ##
 ## file: drivers/media/parport/Kconfig
 ##
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_W9966 is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
 
 ##
 ## file: drivers/media/pci/cx88/Kconfig