From c6333e772622c6abd4bf5b797fb9147a8a216bbe Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 22 Dec 2012 02:52:54 +0000 Subject: [PATCH] [mips,mipsel,sparc] media/parpot: Disable VIDEO_PMS in all configurations where the other parport video drivers are disabled svn path=/dists/trunk/linux/; revision=19625 --- debian/changelog | 2 ++ debian/config/mips/config.r4k-ip22 | 5 +---- debian/config/mips/config.r5k-ip32 | 4 +--- debian/config/mips/config.sb1-bcm91250a | 4 +--- debian/config/mips/config.sb1a-bcm91480b | 4 +--- debian/config/mipsel/config.r5k-cobalt | 4 +--- debian/config/sparc/config | 4 +--- 7 files changed, 8 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index d76d0b39a..c6aac4b8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ linux (3.7.1-1~experimental.1) UNRELEASED; urgency=low * 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 Thu, 06 Dec 2012 18:14:33 +0100 diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index 72749874a..62b03a270 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -263,10 +263,7 @@ CONFIG_SERIO_RAW=y ## ## 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 diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 869486b05..a5de14130 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -285,9 +285,7 @@ CONFIG_SERIO_RAW=y ## ## 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 diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index f2aab8209..2cce14991 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -336,9 +336,7 @@ CONFIG_SERIO_LIBPS2=y ## ## 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 diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 100f1e284..7c7593ac9 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -342,9 +342,7 @@ CONFIG_SERIO_LIBPS2=y ## ## 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 diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 7b801cc01..918d2b4cf 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -265,9 +265,7 @@ CONFIG_LEDS_COBALT_RAQ=y ## ## 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 diff --git a/debian/config/sparc/config b/debian/config/sparc/config index e2d9f3850..42059f28d 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -216,9 +216,7 @@ CONFIG_SERIO_LIBPS2=y ## ## 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