Re: [2.6.26.y PATCH 6/7] V4L: uvcvideo: Make input device support optional

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Greg,

> From: Laurent Pinchart <laurent.pinchart@xxxxxxxxx>
> 
> V4L: uvcvideo: Make input device support optional
> 
> UVC devices can report button events. The uvcvideo driver depends on
> CONFIG_INPUT to report events to the input layer. This patch removes the hard
> dependency by introducing a new CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV option.

While running some sanity checks here, I noticed a difference between my -git
and my -hg. Probably some failure on my previous merge scripts (I've rewrote
they to avoid to have such bad things happening again). 

The issue is that -git forgot to apply one hunk at media/video/Kconfig
(probably caused by stgit or by some tree rebase).

I'll add the fix for it on my next pull request on mainstream, after handling
some additional things here. So, please add the enclosed patch also at -stable
(or, if you prefer, postpone both patches to 2.6.26.2).

Cheers,
Mauro.

---

commit 4c7827eec78abe6fe68fd29305806467f2a51e63
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Date:   Mon Jul 7 20:04:29 2008 -0300

    V4L/DVB (8234a): uvcvideo: Fix build for uvc input
    
    Fix a bug introduced by some trouble on my -git tree that resulted on a hunk to
    be lost (probably caused by some rebase).
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f606d29..2a747db 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -806,13 +806,7 @@ menuconfig V4L_USB_DRIVERS
 
 if V4L_USB_DRIVERS && USB
 
-config USB_VIDEO_CLASS
-	tristate "USB Video Class (UVC)"
-	---help---
-	  Support for the USB Video Class (UVC).  Currently only video
-	  input devices, such as webcams, are supported.
-
-	  For more information see: <http://linux-uvc.berlios.de/>
+source "drivers/media/video/uvc/Kconfig"
 
 source "drivers/media/video/gspca/Kconfig"

_______________________________________________
v4l-dvb-maintainer mailing list
v4l-dvb-maintainer@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/v4l-dvb-maintainer

[Index of Archives]     [Linux Media]     [Older V4L]     [Linux DVB]     [Video Disk Recorder]     [Asterisk]     [Photo]     [DCCP]     [Netdev]     [Xorg]     [Util Linux NG]     [Xfree86]     [Free Photo Albums]     [Fedora Users]     [Fedora Women]     [ALSA Users]     [ALSA Devel]     [SSH]     [Linux USB]

  Powered by Linux