diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:34:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:34:22 +0200 |
| commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
| tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /drivers/media/video/Kconfig | |
| parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| download | op-kernel-dev-6679ce6e5f519096612b480d255d9ca97be0c2be.zip op-kernel-dev-6679ce6e5f519096612b480d255d9ca97be0c2be.tar.gz | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'drivers/media/video/Kconfig')
| -rw-r--r-- | drivers/media/video/Kconfig | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index f606d29..d4a6e56 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -487,17 +487,6 @@ config VIDEO_PMS To compile this driver as a module, choose M here: the module will be called pms. -config VIDEO_PLANB - tristate "PlanB Video-In on PowerMac" - depends on PPC_PMAC && VIDEO_V4L1 && BROKEN - help - PlanB is the V4L driver for the PowerMac 7x00/8x00 series video - input hardware. If you want to experiment with this, say Y. - Otherwise, or if you don't understand a word, say N. See - <http://www.cpu.lu/~mlan/linux/dev/planb.html> for more info. - - Saying M will compile this driver as a module (planb). - config VIDEO_BWQCAM tristate "Quickcam BW Video For Linux" depends on PARPORT && VIDEO_V4L1 @@ -806,13 +795,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" |
