git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
Kconfig
diff --git
a/drivers/media/video/Kconfig
b/drivers/media/video/Kconfig
index 5cb3f54b548b1dc9f678d486cafa5b8026c58135..e204e7b4028a986c7b3de8c5b8b95f86eac58180 100644
(file)
--- a/
drivers/media/video/Kconfig
+++ b/
drivers/media/video/Kconfig
@@
-11,7
+11,7
@@
menuconfig VIDEO_CAPTURE_DRIVERS
webcams, analog TV, and hybrid analog/digital TV.
Some of those devices also supports FM radio.
webcams, analog TV, and hybrid analog/digital TV.
Some of those devices also supports FM radio.
-if VIDEO_CAPTURE_DRIVERS
+if VIDEO_CAPTURE_DRIVERS
&& VIDEO_DEV
config VIDEO_ADV_DEBUG
bool "Enable advanced debug functionality"
config VIDEO_ADV_DEBUG
bool "Enable advanced debug functionality"
@@
-489,6
+489,15
@@
config TUNER_3036
Say Y here to include support for Philips SAB3036 compatible tuners.
If in doubt, say N.
Say Y here to include support for Philips SAB3036 compatible tuners.
If in doubt, say N.
+config TUNER_TEA5761
+ bool "TEA 5761 radio tuner (EXPERIMENTAL)"
+ depends on EXPERIMENTAL
+ depends on I2C
+ select VIDEO_TUNER
+ help
+ Say Y here to include support for Philips TEA5761 radio tuner.
+ If in doubt, say N.
+
config VIDEO_VINO
tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2
config VIDEO_VINO
tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2
@@
-500,7
+509,7
@@
config VIDEO_VINO
config VIDEO_STRADIS
tristate "Stradis 4:2:2 MPEG-2 video driver (EXPERIMENTAL)"
config VIDEO_STRADIS
tristate "Stradis 4:2:2 MPEG-2 video driver (EXPERIMENTAL)"
- depends on EXPERIMENTAL && PCI && VIDEO_V4L1 &&
!PPC64
+ depends on EXPERIMENTAL && PCI && VIDEO_V4L1 &&
VIRT_TO_BUS
help
Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video
driver for PCI. There is a product page at
help
Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video
driver for PCI. There is a product page at
@@
-511,7
+520,7
@@
config VIDEO_ZORAN_ZR36060
config VIDEO_ZORAN
tristate "Zoran ZR36057/36067 Video For Linux"
config VIDEO_ZORAN
tristate "Zoran ZR36057/36067 Video For Linux"
- depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 &&
!PPC64
+ depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 &&
VIRT_TO_BUS
help
Say Y for support for MJPEG capture cards based on the Zoran
36057/36067 PCI controller chipset. This includes the Iomega
help
Say Y for support for MJPEG capture cards based on the Zoran
36057/36067 PCI controller chipset. This includes the Iomega
@@
-691,7
+700,7
@@
menuconfig V4L_USB_DRIVERS
depends on USB
default y
depends on USB
default y
-if V4L_USB_DRIVERS
+if V4L_USB_DRIVERS
&& USB
source "drivers/media/video/pvrusb2/Kconfig"
source "drivers/media/video/pvrusb2/Kconfig"