2006-10-07 19:27:04

by Michael Ira Krufky

[permalink] [raw]
Subject: Re: pvrusb2 and 2.6.19-rc1

>From 9ce12c8763cc244725dec99085efd293483c6bf8 Mon Sep 17 00:00:00 2001
From: Michael Krufky <[email protected]>
Date: Sat, 7 Oct 2006 15:10:53 -0400
Subject: [PATCH] Kconfig: restore pvrusb2 menu items

Looks like the pvrusb2 menu items were accidentally removed in
git commit 1450e6bedc58c731617d99b4670070ed3ccc91b4

This patch restores the menu items so that the pvrusb2 driver can be built.

Signed-off-by: Michael Krufky <[email protected]>
---
drivers/media/video/Kconfig | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index afb734d..fbe5b61 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -677,6 +677,8 @@ #
menu "V4L USB devices"
depends on USB && VIDEO_DEV

+source "drivers/media/video/pvrusb2/Kconfig"
+
source "drivers/media/video/em28xx/Kconfig"

source "drivers/media/video/usbvideo/Kconfig"
--
1.4.2.1


Attachments:
0001-Kconfig-restore-pvrusb2-menu-items.txt (947.00 B)

2006-10-09 20:52:21

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: Re: pvrusb2 and 2.6.19-rc1

Em S?b, 2006-10-07 ?s 15:26 -0400, Michael Krufky escreveu:
> Mike Isely wrote:
> > Mauro:
> >
> > Why are the pvrusb2 configuration switches nowhere to be found in
> > 2.6.19-rc1? I'm running xconfig here and searching reverse-deps to try
> > and locate it. Best I can tell is that it's gone. The driver sources are
> > still present. What's going on?
> >
> Mauro, please pull from:
>
> |git://git.kernel.org/pub/scm/linux/kernel/git/mkrufky/v4l-dvb.git
>
> to fix the issue described by Mike Isely, above... ||or just apply the
> attached patch to your git tree and send to Linus.|
> |
> This problem is only present in your git tree -- the hg tree is in good
> shape. How did this happen, Mauro?

Fixed, and included at my tree. I'll ask Linus to pull with the next
patchsets.

>
> Regards,
>
> Michael Krufky
>
>
> |
> anexo Documento somente texto
> (0001-Kconfig-restore-pvrusb2-menu-items.txt)
> From 9ce12c8763cc244725dec99085efd293483c6bf8 Mon Sep 17 00:00:00 2001
> From: Michael Krufky <[email protected]>
> Date: Sat, 7 Oct 2006 15:10:53 -0400
> Subject: [PATCH] Kconfig: restore pvrusb2 menu items
>
> Looks like the pvrusb2 menu items were accidentally removed in
> git commit 1450e6bedc58c731617d99b4670070ed3ccc91b4
>
> This patch restores the menu items so that the pvrusb2 driver can be built.
>
> Signed-off-by: Michael Krufky <[email protected]>
> ---
> drivers/media/video/Kconfig | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
> index afb734d..fbe5b61 100644
> --- a/drivers/media/video/Kconfig
> +++ b/drivers/media/video/Kconfig
> @@ -677,6 +677,8 @@ #
> menu "V4L USB devices"
> depends on USB && VIDEO_DEV
>
> +source "drivers/media/video/pvrusb2/Kconfig"
> +
> source "drivers/media/video/em28xx/Kconfig"
>
> source "drivers/media/video/usbvideo/Kconfig"
Cheers,
Mauro.