diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 00:12:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 00:12:49 -0400 |
| commit | df462b3dbeeaae7141f1b63cbfcc1e1bae6a85fc (patch) | |
| tree | bca52fce066159f136d75c69e79016422212cb1d /drivers/media/video/gspca/Kconfig | |
| parent | 343800e7d20944aead238c2c6e3f7789f8b6587c (diff) | |
| parent | cf25220677b3f10468a74278130fe224f73632a6 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits)
[media] gspca - sunplus: Fix some warnings and simplify code
[media] gspca: Fix some warnings tied to 'no debug'
[media] gspca: Unset debug by default
[media] gspca - cpia1: Remove a bad conditional compilation instruction
[media] gspca - main: Remove USB traces
[media] gspca - main: Version change to 2.13
[media] gspca - stk014 / t613: Accept the index 0 in querymenu
[media] gspca - kinect: Remove __devinitdata
[media] gspca - cpia1: Fix some warnings
[media] video/Kconfig: Fix mis-classified devices
[media] support for medion dvb stick 1660:1921
[media] tm6000: fix uninitialized field, change prink to dprintk
[media] cx231xx: Add support for Iconbit U100
[media] saa7134 add new TV cards
[media] Use a more consistent value for RC repeat period
[media] cx18: Move spinlock and vb_type initialisation into stream_init
[media] tm6000: remove tm6010 sif audio start and stop
[media] tm6000: remove unused exports
[media] tm6000: add pts logging
[media] tm6000: change from ioctl to unlocked_ioctl
...
Diffstat (limited to 'drivers/media/video/gspca/Kconfig')
| -rw-r--r-- | drivers/media/video/gspca/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/Kconfig b/drivers/media/video/gspca/Kconfig index eb04e8b59989..34ae2c299799 100644 --- a/drivers/media/video/gspca/Kconfig +++ b/drivers/media/video/gspca/Kconfig | |||
| @@ -77,6 +77,15 @@ config USB_GSPCA_JEILINJ | |||
| 77 | To compile this driver as a module, choose M here: the | 77 | To compile this driver as a module, choose M here: the |
| 78 | module will be called gspca_jeilinj. | 78 | module will be called gspca_jeilinj. |
| 79 | 79 | ||
| 80 | config USB_GSPCA_KINECT | ||
| 81 | tristate "Kinect sensor device USB Camera Driver" | ||
| 82 | depends on VIDEO_V4L2 && USB_GSPCA | ||
| 83 | help | ||
| 84 | Say Y here if you want support for the Microsoft Kinect sensor device. | ||
| 85 | |||
| 86 | To compile this driver as a module, choose M here: the | ||
| 87 | module will be called gspca_kinect. | ||
| 88 | |||
| 80 | config USB_GSPCA_KONICA | 89 | config USB_GSPCA_KONICA |
| 81 | tristate "Konica USB Camera V4L2 driver" | 90 | tristate "Konica USB Camera V4L2 driver" |
| 82 | depends on VIDEO_V4L2 && USB_GSPCA | 91 | depends on VIDEO_V4L2 && USB_GSPCA |