V4L/DVB (8703): gspca: Do controls work for spca561 revision 12a.

[safe/jmp/linux-2.6] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index ef80310..ecbfa1b 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -1,15 +1,70 @@
 #
 #

+# Generic video config states
+#
+
+config VIDEO_V4L2
+       tristate
+       depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+       default VIDEO_DEV && VIDEO_V4L2_COMMON
+
+config VIDEO_V4L1
+       tristate
+       depends on VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
+       default VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
+
+config VIDEOBUF_GEN
+       tristate
+
+config VIDEOBUF_DMA_SG
+       depends on HAS_DMA
+       select VIDEOBUF_GEN
+       tristate
+
+config VIDEOBUF_VMALLOC
+       select VIDEOBUF_GEN
+       tristate
+
+config VIDEOBUF_DMA_CONTIG
+       depends on HAS_DMA
+       select VIDEOBUF_GEN
+       tristate
+
+config VIDEOBUF_DVB
+       tristate
+       select VIDEOBUF_GEN
+
+config VIDEO_BTCX
+       tristate
+
+config VIDEO_IR
+       tristate
+       depends on INPUT
+
+config VIDEO_TVEEPROM
+       tristate
+       depends on I2C
+
+config VIDEO_TUNER
+       tristate
+       depends on MEDIA_TUNER
+
+#

 # Multimedia Video device configuration
 #
 
 # Multimedia Video device configuration
 #
 

-menu "Video Capture Adapters"
-       depends on VIDEO_DEV
+menuconfig VIDEO_CAPTURE_DRIVERS
+       bool "Video capture adapters"
+       depends on VIDEO_V4L2
+       default y
+       ---help---
+         Say Y here to enable selecting the video adapters for
+         webcams, analog TV, and hybrid analog/digital TV.
+         Some of those devices also supports FM radio.

 
 

-comment "Video Capture Adapters"
+if VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2

 
 config VIDEO_ADV_DEBUG
        bool "Enable advanced debug functionality"
 
 config VIDEO_ADV_DEBUG
        bool "Enable advanced debug functionality"

-       depends on VIDEO_DEV

        default n
        ---help---
          Say Y here to enable advanced debugging functionality on some
        default n
        ---help---
          Say Y here to enable advanced debugging functionality on some


@@ -29,18 +84,31 @@ config VIDEO_HELPER_CHIPS_AUTO
 
          In doubt, say Y.
 
 
          In doubt, say Y.
 

+config VIDEO_IR_I2C
+       tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO
+       depends on I2C && VIDEO_IR
+       default y
+       ---help---
+         Most boards have an IR chip directly connected via GPIO. However,
+         some video boards have the IR connected via I2C bus.
+
+         If your board doesn't have an I2C IR chip, you may disable this
+         option.
+
+         In doubt, say Y.
+

 #
 # Encoder / Decoder module configuration
 #
 
 menu "Encoders/decoders and other helper chips"
 #
 # Encoder / Decoder module configuration
 #
 
 menu "Encoders/decoders and other helper chips"

-       depends on VIDEO_DEV && !VIDEO_HELPER_CHIPS_AUTO
+       depends on !VIDEO_HELPER_CHIPS_AUTO

 
 comment "Audio decoders"
 
 config VIDEO_TVAUDIO
        tristate "Simple audio decoder chips"
 
 comment "Audio decoders"
 
 config VIDEO_TVAUDIO
        tristate "Simple audio decoder chips"

-       depends on VIDEO_V4L1 && I2C
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for several audio decoder chips found on some bt8xx boards:
          Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300,
        ---help---
          Support for several audio decoder chips found on some bt8xx boards:
          Philips: tda9840, tda9873h, tda9874h/a, tda9850, tda985x, tea6300,


@@ -52,7 +120,7 @@ config VIDEO_TVAUDIO
 
 config VIDEO_TDA7432
        tristate "Philips TDA7432 audio processor"
 
 config VIDEO_TDA7432
        tristate "Philips TDA7432 audio processor"

-       depends on VIDEO_V4L1 && I2C
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for tda7432 audio decoder chip found on some bt8xx boards.
 
        ---help---
          Support for tda7432 audio decoder chip found on some bt8xx boards.
 


@@ -61,7 +129,7 @@ config VIDEO_TDA7432
 
 config VIDEO_TDA9840
        tristate "Philips TDA9840 audio processor"
 
 config VIDEO_TDA9840
        tristate "Philips TDA9840 audio processor"

-       depends on VIDEO_DEV && I2C
+       depends on I2C

        ---help---
          Support for tda9840 audio decoder chip found on some Zoran boards.
 
        ---help---
          Support for tda9840 audio decoder chip found on some Zoran boards.
 


@@ -70,7 +138,7 @@ config VIDEO_TDA9840
 
 config VIDEO_TDA9875
        tristate "Philips TDA9875 audio processor"
 
 config VIDEO_TDA9875
        tristate "Philips TDA9875 audio processor"

-       depends on VIDEO_V4L1 && I2C
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for tda9875 audio decoder chip found on some bt8xx boards.
 
        ---help---
          Support for tda9875 audio decoder chip found on some bt8xx boards.
 


@@ -79,7 +147,7 @@ config VIDEO_TDA9875
 
 config VIDEO_TEA6415C
        tristate "Philips TEA6415C audio processor"
 
 config VIDEO_TEA6415C
        tristate "Philips TEA6415C audio processor"

-       depends on VIDEO_DEV && I2C
+       depends on I2C

        ---help---
          Support for tea6415c audio decoder chip found on some bt8xx boards.
 
        ---help---
          Support for tea6415c audio decoder chip found on some bt8xx boards.
 


@@ -88,7 +156,7 @@ config VIDEO_TEA6415C
 
 config VIDEO_TEA6420
        tristate "Philips TEA6420 audio processor"
 
 config VIDEO_TEA6420
        tristate "Philips TEA6420 audio processor"

-       depends on VIDEO_DEV && I2C
+       depends on I2C

        ---help---
          Support for tea6420 audio decoder chip found on some bt8xx boards.
 
        ---help---
          Support for tea6420 audio decoder chip found on some bt8xx boards.
 


@@ -104,9 +172,19 @@ config VIDEO_MSP3400
          To compile this driver as a module, choose M here: the
          module will be called msp3400.
 
          To compile this driver as a module, choose M here: the
          module will be called msp3400.
 

+config VIDEO_CS5345
+       tristate "Cirrus Logic CS5345 audio ADC"
+       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       ---help---
+         Support for the Cirrus Logic CS5345 24-bit, 192 kHz
+         stereo A/D converter.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cs5345.
+

 config VIDEO_CS53L32A
        tristate "Cirrus Logic CS53L32A audio ADC"
 config VIDEO_CS53L32A
        tristate "Cirrus Logic CS53L32A audio ADC"

-       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for the Cirrus Logic CS53L32A low voltage
          stereo A/D converter.
        ---help---
          Support for the Cirrus Logic CS53L32A low voltage
          stereo A/D converter.


@@ -114,6 +192,15 @@ config VIDEO_CS53L32A
          To compile this driver as a module, choose M here: the
          module will be called cs53l32a.
 
          To compile this driver as a module, choose M here: the
          module will be called cs53l32a.
 

+config VIDEO_M52790
+       tristate "Mitsubishi M52790 A/V switch"
+       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       ---help---
+        Support for the Mitsubishi M52790 A/V switch.
+
+        To compile this driver as a module, choose M here: the
+        module will be called m52790.
+

 config VIDEO_TLV320AIC23B
        tristate "Texas Instruments TLV320AIC23B audio codec"
        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
 config VIDEO_TLV320AIC23B
        tristate "Texas Instruments TLV320AIC23B audio codec"
        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL


@@ -125,7 +212,7 @@ config VIDEO_TLV320AIC23B
 
 config VIDEO_WM8775
        tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer"
 
 config VIDEO_WM8775
        tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer"

-       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for the Wolfson Microelectronics WM8775 high
          performance stereo A/D Converter with a 4 channel input mixer.
        ---help---
          Support for the Wolfson Microelectronics WM8775 high
          performance stereo A/D Converter with a 4 channel input mixer.


@@ -135,7 +222,7 @@ config VIDEO_WM8775
 
 config VIDEO_WM8739
        tristate "Wolfson Microelectronics WM8739 stereo audio ADC"
 
 config VIDEO_WM8739
        tristate "Wolfson Microelectronics WM8739 stereo audio ADC"

-       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for the Wolfson Microelectronics WM8739
          stereo A/D Converter.
        ---help---
          Support for the Wolfson Microelectronics WM8739
          stereo A/D Converter.


@@ -143,6 +230,15 @@ config VIDEO_WM8739
          To compile this driver as a module, choose M here: the
          module will be called wm8739.
 
          To compile this driver as a module, choose M here: the
          module will be called wm8739.
 

+config VIDEO_VP27SMPX
+       tristate "Panasonic VP27s internal MPX"
+       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       ---help---
+         Support for the internal MPX of the Panasonic VP27s tuner.
+
+         To compile this driver as a module, choose M here: the
+         module will be called vp27smpx.
+

 comment "Video decoders"
 
 config VIDEO_BT819
 comment "Video decoders"
 
 config VIDEO_BT819


@@ -192,6 +288,13 @@ config VIDEO_OV7670
          OV7670 VGA camera.  It currently only works with the M88ALP01
          controller.
 
          OV7670 VGA camera.  It currently only works with the M88ALP01
          controller.
 

+config VIDEO_TCM825X
+       tristate "TCM825x camera sensor support"
+       depends on I2C && VIDEO_V4L2
+       ---help---
+         This is a driver for the Toshiba TCM825x VGA camera sensor.
+         It is used for example in Nokia N800.
+

 config VIDEO_SAA7110
        tristate "Philips SAA7110 video decoder"
        depends on VIDEO_V4L1 && I2C
 config VIDEO_SAA7110
        tristate "Philips SAA7110 video decoder"
        depends on VIDEO_V4L1 && I2C


@@ -223,13 +326,22 @@ config VIDEO_SAA7114
 
 config VIDEO_SAA711X
        tristate "Philips SAA7113/4/5 video decoders"
 
 config VIDEO_SAA711X
        tristate "Philips SAA7113/4/5 video decoders"

-       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for the Philips SAA7113/4/5 video decoders.
 
          To compile this driver as a module, choose M here: the
          module will be called saa7115.
 
        ---help---
          Support for the Philips SAA7113/4/5 video decoders.
 
          To compile this driver as a module, choose M here: the
          module will be called saa7115.
 

+config VIDEO_SAA717X
+       tristate "Philips SAA7171/3/4 audio/video decoders"
+       depends on VIDEO_V4L2 && I2C
+       ---help---
+         Support for the Philips SAA7171/3/4 audio/video decoders.
+
+         To compile this driver as a module, choose M here: the
+         module will be called saa717x.
+

 config VIDEO_SAA7191
        tristate "Philips SAA7191 video decoder"
        depends on VIDEO_V4L1 && I2C
 config VIDEO_SAA7191
        tristate "Philips SAA7191 video decoder"
        depends on VIDEO_V4L1 && I2C


@@ -265,7 +377,7 @@ comment "MPEG video encoders"
 
 config VIDEO_CX2341X
        tristate "Conexant CX2341x MPEG encoders"
 
 config VIDEO_CX2341X
        tristate "Conexant CX2341x MPEG encoders"

-       depends on VIDEO_V4L2 && EXPERIMENTAL
+       depends on VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_COMMON

        ---help---
          Support for the Conexant CX23416 MPEG encoders
          and CX23415 MPEG encoder/decoders.
        ---help---
          Support for the Conexant CX23416 MPEG encoders
          and CX23415 MPEG encoder/decoders.


@@ -279,7 +391,7 @@ comment "Video encoders"
 
 config VIDEO_SAA7127
        tristate "Philips SAA7127/9 digital video encoders"
 
 config VIDEO_SAA7127
        tristate "Philips SAA7127/9 digital video encoders"

-       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for the Philips SAA7127/9 digital video encoders.
 
        ---help---
          Support for the Philips SAA7127/9 digital video encoders.
 


@@ -317,7 +429,7 @@ comment "Video improvement chips"
 
 config VIDEO_UPD64031A
        tristate "NEC Electronics uPD64031A Ghost Reduction"
 
 config VIDEO_UPD64031A
        tristate "NEC Electronics uPD64031A Ghost Reduction"

-       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for the NEC Electronics uPD64031A Ghost Reduction
          video chip. It is most often found in NTSC TV cards made for
        ---help---
          Support for the NEC Electronics uPD64031A Ghost Reduction
          video chip. It is most often found in NTSC TV cards made for


@@ -329,7 +441,7 @@ config VIDEO_UPD64031A
 
 config VIDEO_UPD64083
        tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"
 
 config VIDEO_UPD64083
        tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"

-       depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+       depends on VIDEO_V4L2 && I2C

        ---help---
          Support for the NEC Electronics uPD64083 3-Dimensional Y/C
          separation video chip. It is used to improve the quality of
        ---help---
          Support for the NEC Electronics uPD64083 3-Dimensional Y/C
          separation video chip. It is used to improve the quality of


@@ -342,8 +454,8 @@ endmenu # encoder / decoder chips
 
 config VIDEO_VIVI
        tristate "Virtual Video Driver"
 
 config VIDEO_VIVI
        tristate "Virtual Video Driver"

-       depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
-       select VIDEO_BUF
+       depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
+       select VIDEOBUF_VMALLOC

        default n
        ---help---
          Enables a virtual video driver. This device shows a color bar
        default n
        ---help---
          Enables a virtual video driver. This device shows a color bar


@@ -375,17 +487,6 @@ config VIDEO_PMS
          To compile this driver as a module, choose M here: the
          module will be called 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
 config VIDEO_BWQCAM
        tristate "Quickcam BW Video For Linux"
        depends on PARPORT && VIDEO_V4L1


@@ -469,7 +570,7 @@ config VIDEO_SAA5246A
 
 config VIDEO_SAA5249
        tristate "SAA5249 Teletext processor"
 
 config VIDEO_SAA5249
        tristate "SAA5249 Teletext processor"

-       depends on VIDEO_DEV && I2C && VIDEO_V4L2
+       depends on I2C && VIDEO_V4L2

        help
          Support for I2C bus based teletext using the SAA5249 chip. At the
          moment this is only useful on some European WinTV cards.
        help
          Support for I2C bus based teletext using the SAA5249 chip. At the
          moment this is only useful on some European WinTV cards.


@@ -479,7 +580,7 @@ config VIDEO_SAA5249
 
 config TUNER_3036
        tristate "SAB3036 tuner"
 
 config TUNER_3036
        tristate "SAB3036 tuner"

-       depends on VIDEO_DEV && I2C && VIDEO_V4L1
+       depends on I2C && VIDEO_V4L1

        help
          Say Y here to include support for Philips SAB3036 compatible tuners.
          If in doubt, say N.
        help
          Say Y here to include support for Philips SAB3036 compatible tuners.
          If in doubt, say N.


@@ -495,18 +596,15 @@ 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
          <http://www.stradis.com/>.
 
        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
          <http://www.stradis.com/>.
 

-config VIDEO_ZORAN_ZR36060
-       tristate
-

 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


@@ -517,74 +615,77 @@ config VIDEO_ZORAN
          To compile this driver as a module, choose M here: the
          module will be called zr36067.
 
          To compile this driver as a module, choose M here: the
          module will be called zr36067.
 

+config VIDEO_ZORAN_DC30
+       tristate "Pinnacle/Miro DC30(+) support"
+       depends on VIDEO_ZORAN
+       select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
+       select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO
+       help
+         Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
+         card. This also supports really old DC10 cards based on the
+         zr36050 MJPEG codec and zr36016 VFE.
+
+config VIDEO_ZORAN_ZR36060
+       tristate "Zoran ZR36060"
+       depends on VIDEO_ZORAN
+       help
+         Say Y to support Zoran boards based on 36060 chips.
+         This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33
+         and 33 R10 and AverMedia 6 boards.
+

 config VIDEO_ZORAN_BUZ
        tristate "Iomega Buz support"
 config VIDEO_ZORAN_BUZ
        tristate "Iomega Buz support"

-       depends on VIDEO_ZORAN
+       depends on VIDEO_ZORAN_ZR36060

        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO

-       select VIDEO_ZORAN_ZR36060

        help
          Support for the Iomega Buz MJPEG capture/playback card.
 
 config VIDEO_ZORAN_DC10
        tristate "Pinnacle/Miro DC10(+) support"
        help
          Support for the Iomega Buz MJPEG capture/playback card.
 
 config VIDEO_ZORAN_DC10
        tristate "Pinnacle/Miro DC10(+) support"

-       depends on VIDEO_ZORAN
-       select VIDEO_SAA7110
+       depends on VIDEO_ZORAN_ZR36060
+       select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO

        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO

-       select VIDEO_ZORAN_ZR36060

        help
          Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback
          card.
 
        help
          Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback
          card.
 

-config VIDEO_ZORAN_DC30
-       tristate "Pinnacle/Miro DC30(+) support"
-       depends on VIDEO_ZORAN
-       select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO
-       select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO
-       help
-         Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
-         card. This also supports really old DC10 cards based on the
-         zr36050 MJPEG codec and zr36016 VFE.
-

 config VIDEO_ZORAN_LML33
        tristate "Linux Media Labs LML33 support"
 config VIDEO_ZORAN_LML33
        tristate "Linux Media Labs LML33 support"

-       depends on VIDEO_ZORAN
+       depends on VIDEO_ZORAN_ZR36060

        select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO

-       select VIDEO_ZORAN_ZR36060

        help
          Support for the Linux Media Labs LML33 MJPEG capture/playback
          card.
 
 config VIDEO_ZORAN_LML33R10
        tristate "Linux Media Labs LML33R10 support"
        help
          Support for the Linux Media Labs LML33 MJPEG capture/playback
          card.
 
 config VIDEO_ZORAN_LML33R10
        tristate "Linux Media Labs LML33R10 support"

-       depends on VIDEO_ZORAN
+       depends on VIDEO_ZORAN_ZR36060

        select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO

-       select VIDEO_ZORAN_ZR36060

        help
          support for the Linux Media Labs LML33R10 MJPEG capture/playback
          card.
 
 config VIDEO_ZORAN_AVS6EYES
        tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"
        help
          support for the Linux Media Labs LML33R10 MJPEG capture/playback
          card.
 
 config VIDEO_ZORAN_AVS6EYES
        tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"

-       depends on VIDEO_ZORAN && EXPERIMENTAL && VIDEO_V4L1
+       depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1

        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO
        select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO

-       select VIDEO_ZORAN_ZR36060

        help
          Support for the AverMedia 6 Eyes video surveillance card.
 
 config VIDEO_MEYE
        tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
        help
          Support for the AverMedia 6 Eyes video surveillance card.
 
 config VIDEO_MEYE
        tristate "Sony Vaio Picturebook Motion Eye Video For Linux"

-       depends on PCI && SONYPI && VIDEO_V4L1
+       depends on PCI && SONY_LAPTOP && VIDEO_V4L1

        ---help---
          This is the video4linux driver for the Motion Eye camera found
          in the Vaio Picturebook laptops. Please read the material in
          <file:Documentation/video4linux/meye.txt> for more information.
 
        ---help---
          This is the video4linux driver for the Motion Eye camera found
          in the Vaio Picturebook laptops. Please read the material in
          <file:Documentation/video4linux/meye.txt> for more information.
 

-         If you say Y or M here, you need to say Y or M to "Sony Programmable
-         I/O Control Device" in the character device section.
+         If you say Y or M here, you need to say Y or M to "Sony Laptop
+         Extras" in the misc device section.

 
          To compile this driver as a module, choose M here: the
          module will be called meye.
 
          To compile this driver as a module, choose M here: the
          module will be called meye.


@@ -647,6 +748,14 @@ config VIDEO_HEXIUM_GEMINI
 
 source "drivers/media/video/cx88/Kconfig"
 
 
 source "drivers/media/video/cx88/Kconfig"
 

+source "drivers/media/video/cx23885/Kconfig"
+
+source "drivers/media/video/au0828/Kconfig"
+
+source "drivers/media/video/ivtv/Kconfig"
+
+source "drivers/media/video/cx18/Kconfig"
+

 config VIDEO_M32R_AR
        tristate "AR devices"
        depends on M32R && VIDEO_V4L1
 config VIDEO_M32R_AR
        tristate "AR devices"
        depends on M32R && VIDEO_V4L1


@@ -668,7 +777,7 @@ config VIDEO_M32R_AR_M64278
 
 config VIDEO_CAFE_CCIC
        tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
 
 config VIDEO_CAFE_CCIC
        tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"

-       depends on I2C && VIDEO_V4L2
+       depends on PCI && I2C && VIDEO_V4L2

        select VIDEO_OV7670
        ---help---
          This is a video4linux2 driver for the Marvell 88ALP01 integrated
        select VIDEO_OV7670
        ---help---
          This is a video4linux2 driver for the Marvell 88ALP01 integrated


@@ -679,13 +788,23 @@ config VIDEO_CAFE_CCIC
 # USB Multimedia device configuration
 #
 
 # USB Multimedia device configuration
 #
 

-menu "V4L USB devices"
-       depends on USB && VIDEO_DEV
+menuconfig V4L_USB_DRIVERS
+       bool "V4L USB devices"
+       depends on USB
+       default y
+
+if V4L_USB_DRIVERS && USB
+
+source "drivers/media/video/uvc/Kconfig"
+
+source "drivers/media/video/gspca/Kconfig"

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

+source "drivers/media/video/usbvision/Kconfig"
+

 source "drivers/media/video/usbvideo/Kconfig"
 
 source "drivers/media/video/et61x251/Kconfig"
 source "drivers/media/video/usbvideo/Kconfig"
 
 source "drivers/media/video/et61x251/Kconfig"


@@ -703,7 +822,7 @@ config VIDEO_OVCAMCHIP
 
 config USB_W9968CF
        tristate "USB W996[87]CF JPEG Dual Mode Camera support"
 
 config USB_W9968CF
        tristate "USB W996[87]CF JPEG Dual Mode Camera support"

-       depends on USB && VIDEO_V4L1 && I2C
+       depends on VIDEO_V4L1 && I2C

        select VIDEO_OVCAMCHIP
        ---help---
          Say Y here if you want support for cameras based on OV681 or
        select VIDEO_OVCAMCHIP
        ---help---
          Say Y here if you want support for cameras based on OV681 or


@@ -721,7 +840,7 @@ config USB_W9968CF
 
 config USB_OV511
        tristate "USB OV511 Camera support"
 
 config USB_OV511
        tristate "USB OV511 Camera support"

-       depends on USB && VIDEO_V4L1
+       depends on VIDEO_V4L1

        ---help---
          Say Y here if you want to connect this type of camera to your
          computer's USB port. See <file:Documentation/video4linux/ov511.txt>
        ---help---
          Say Y here if you want to connect this type of camera to your
          computer's USB port. See <file:Documentation/video4linux/ov511.txt>


@@ -732,7 +851,7 @@ config USB_OV511
 
 config USB_SE401
        tristate "USB SE401 Camera support"
 
 config USB_SE401
        tristate "USB SE401 Camera support"

-       depends on USB && VIDEO_V4L1
+       depends on VIDEO_V4L1

        ---help---
          Say Y here if you want to connect this type of camera to your
          computer's USB port. See <file:Documentation/video4linux/se401.txt>
        ---help---
          Say Y here if you want to connect this type of camera to your
          computer's USB port. See <file:Documentation/video4linux/se401.txt>


@@ -745,7 +864,7 @@ source "drivers/media/video/sn9c102/Kconfig"
 
 config USB_STV680
        tristate "USB STV680 (Pencam) Camera support"
 
 config USB_STV680
        tristate "USB STV680 (Pencam) Camera support"

-       depends on USB && VIDEO_V4L1
+       depends on VIDEO_V4L1

        ---help---
          Say Y here if you want to connect this type of camera to your
          computer's USB port. This includes the Pencam line of cameras.
        ---help---
          Say Y here if you want to connect this type of camera to your
          computer's USB port. This includes the Pencam line of cameras.


@@ -759,6 +878,100 @@ source "drivers/media/video/zc0301/Kconfig"
 
 source "drivers/media/video/pwc/Kconfig"
 
 
 source "drivers/media/video/pwc/Kconfig"
 

-endmenu # V4L USB devices
+config USB_ZR364XX
+       tristate "USB ZR364XX Camera support"
+       depends on VIDEO_V4L2
+       ---help---
+         Say Y here if you want to connect this type of camera to your
+         computer's USB port.
+         See <file:Documentation/video4linux/zr364xx.txt> for more info
+         and list of supported cameras.
+
+         To compile this driver as a module, choose M here: the
+         module will be called zr364xx.
+
+config USB_STKWEBCAM
+       tristate "USB Syntek DC1125 Camera support"
+       depends on VIDEO_V4L2 && EXPERIMENTAL
+       ---help---
+         Say Y here if you want to use this type of camera.
+         Supported devices are typically found in some Asus laptops,
+         with USB id 174f:a311 and 05e1:0501. Other Syntek cameras
+         may be supported by the stk11xx driver, from which this is
+         derived, see http://stk11xx.sourceforge.net
+
+         To compile this driver as a module, choose M here: the
+         module will be called stkwebcam.
+
+config USB_S2255
+       tristate "USB Sensoray 2255 video capture device"
+       depends on VIDEO_V4L2
+       select VIDEOBUF_VMALLOC
+       default n
+       help
+         Say Y here if you want support for the Sensoray 2255 USB device.
+         This driver can be compiled as a module, called s2255drv.
+
+endif # V4L_USB_DRIVERS
+
+config SOC_CAMERA
+       tristate "SoC camera support"
+       depends on VIDEO_V4L2 && HAS_DMA
+       select VIDEOBUF_GEN
+       help
+         SoC Camera is a common API to several cameras, not connecting
+         over a bus like PCI or USB. For example some i2c camera connected
+         directly to the data bus of an SoC.
+
+config SOC_CAMERA_MT9M001
+       tristate "mt9m001 support"
+       depends on SOC_CAMERA && I2C
+       select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
+       help
+         This driver supports MT9M001 cameras from Micron, monochrome
+         and colour models.
+
+config MT9M001_PCA9536_SWITCH
+       bool "pca9536 datawidth switch for mt9m001"
+       depends on SOC_CAMERA_MT9M001 && GENERIC_GPIO
+       help
+         Select this if your MT9M001 camera uses a PCA9536 I2C GPIO
+         extender to switch between 8 and 10 bit datawidth modes
+
+config SOC_CAMERA_MT9V022
+       tristate "mt9v022 support"
+       depends on SOC_CAMERA && I2C
+       select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
+       help
+         This driver supports MT9V022 cameras from Micron
+
+config MT9V022_PCA9536_SWITCH
+       bool "pca9536 datawidth switch for mt9v022"
+       depends on SOC_CAMERA_MT9V022 && GENERIC_GPIO
+       help
+         Select this if your MT9V022 camera uses a PCA9536 I2C GPIO
+         extender to switch between 8 and 10 bit datawidth modes
+
+config SOC_CAMERA_PLATFORM
+       tristate "platform camera support"
+       depends on SOC_CAMERA
+       help
+         This is a generic SoC camera platform driver, useful for testing
+
+config VIDEO_PXA27x
+       tristate "PXA27x Quick Capture Interface driver"
+       depends on VIDEO_DEV && PXA27x
+       select SOC_CAMERA
+       select VIDEOBUF_DMA_SG
+       ---help---
+         This is a v4l2 driver for the PXA27x Quick Capture Interface
+
+config VIDEO_SH_MOBILE_CEU
+       tristate "SuperH Mobile CEU Interface driver"
+       depends on VIDEO_DEV
+       select SOC_CAMERA
+       select VIDEOBUF_DMA_CONTIG
+       ---help---
+         This is a v4l2 driver for the SuperH Mobile CEU Interface

 
 

-endmenu
+endif # VIDEO_CAPTURE_DRIVERS