1 files changed, 248 insertions, 179 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index b303a3f8a9f..9adada0d744 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -533,6 +533,13 @@ config VIDEO_ADP1653
           This is a driver for the ADP1653 flash controller. It is used for
           example in Nokia N900.
 
+config VIDEO_AS3645A
+        tristate "AS3645A flash driver support"
+        depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
+        ---help---
+          This is a driver for the AS3645A and LM3555 flash controllers. It has
+          build in control for flash, torch and indicator LEDs.
+
 comment "Video improvement chips"
 
 config VIDEO_UPD64031A
@@ -580,25 +587,6 @@ config VIDEO_M52790
 
 endmenu # encoder / decoder chips
 
-config VIDEO_SH_VOU
-        tristate "SuperH VOU video output driver"
-        depends on VIDEO_DEV && ARCH_SHMOBILE
-        select VIDEOBUF_DMA_CONTIG
-        help
-          Support for the Video Output Unit (VOU) on SuperH SoCs.
-
-config VIDEO_VIU
-        tristate "Freescale VIU Video Driver"
-        depends on VIDEO_V4L2 && PPC_MPC512x
-        select VIDEOBUF_DMA_CONTIG
-        default y
-        ---help---
-          Support for Freescale VIU video driver. This device captures
-          video data, or overlays video on DIU frame buffer.
-
-          Say Y here if you want to enable VIU device on MPC5121e Rev2+.
-          In doubt, say N.
-
 config VIDEO_VIVI
         tristate "Virtual Video Driver"
         depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
@@ -613,66 +601,130 @@ config VIDEO_VIVI
           Say Y here if you want to test video apps or debug V4L devices.
           In doubt, say N.
 
-source "drivers/media/video/davinci/Kconfig"
+#
+# USB Multimedia device configuration
+#
 
-source "drivers/media/video/omap/Kconfig"
+menuconfig V4L_USB_DRIVERS
+        bool "V4L USB devices"
+        depends on USB
+        default y
 
-source "drivers/media/video/bt8xx/Kconfig"
+if V4L_USB_DRIVERS
 
-config VIDEO_PMS
-        tristate "Mediavision Pro Movie Studio Video For Linux"
-        depends on ISA && VIDEO_V4L2
-        help
-          Say Y if you have such a thing.
+source "drivers/media/video/uvc/Kconfig"
+
+source "drivers/media/video/gspca/Kconfig"
+
+source "drivers/media/video/pvrusb2/Kconfig"
+
+source "drivers/media/video/hdpvr/Kconfig"
+
+source "drivers/media/video/em28xx/Kconfig"
+
+source "drivers/media/video/tlg2300/Kconfig"
+
+source "drivers/media/video/cx231xx/Kconfig"
+
+source "drivers/media/video/tm6000/Kconfig"
+
+source "drivers/media/video/usbvision/Kconfig"
+
+source "drivers/media/video/et61x251/Kconfig"
+
+source "drivers/media/video/sn9c102/Kconfig"
+
+source "drivers/media/video/pwc/Kconfig"
+
+source "drivers/media/video/cpia2/Kconfig"
+
+config USB_ZR364XX
+        tristate "USB ZR364XX Camera support"
+        depends on VIDEO_V4L2
+        select VIDEOBUF_GEN
+        select VIDEOBUF_VMALLOC
+        ---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 pms.
+          module will be called zr364xx.
 
-config VIDEO_BWQCAM
-        tristate "Quickcam BW Video For Linux"
-        depends on PARPORT && VIDEO_V4L2
-        help
-          Say Y have if you the black and white version of the QuickCam
-          camera. See the next option for the color version.
+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://sourceforge.net/projects/syntekdriver/>
 
           To compile this driver as a module, choose M here: the
-          module will be called bw-qcam.
+          module will be called stkwebcam.
 
-config VIDEO_CQCAM
-        tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && PARPORT && VIDEO_V4L2
+config USB_S2255
+        tristate "USB Sensoray 2255 video capture device"
+        depends on VIDEO_V4L2
+        select VIDEOBUF_VMALLOC
+        default n
         help
-          This is the video4linux driver for the colour version of the
-          Connectix QuickCam.  If you have one of these cameras, say Y here,
-          otherwise say N.  This driver does not work with the original
-          monochrome QuickCam, QuickCam VC or QuickClip.  It is also available
-          as a module (c-qcam).
-          Read <file:Documentation/video4linux/CQcam.txt> for more information.
+          Say Y here if you want support for the Sensoray 2255 USB device.
+          This driver can be compiled as a module, called s2255drv.
 
-config VIDEO_W9966
-        tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux"
-        depends on PARPORT_1284 && PARPORT && VIDEO_V4L2
-        help
-          Video4linux driver for Winbond's w9966 based Webcams.
-          Currently tested with the LifeView FlyCam Supra.
-          If you have one of these cameras, say Y here
-          otherwise say N.
-          This driver is also available as a module (w9966).
+endif # V4L_USB_DRIVERS
 
-          Check out <file:Documentation/video4linux/w9966.txt> for more
-          information.
+#
+# PCI drivers configuration
+#
 
-source "drivers/media/video/cpia2/Kconfig"
+menuconfig V4L_PCI_DRIVERS
+        bool "V4L PCI(e) devices"
+        depends on PCI
+        default y
+        ---help---
+          Say Y here to enable support for these PCI(e) drivers.
 
-config VIDEO_VINO
-        tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
-        depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2
-        select VIDEO_SAA7191 if VIDEO_HELPER_CHIPS_AUTO
-        help
-          Say Y here to build in support for the Vino video input system found
-          on SGI Indy machines.
+if V4L_PCI_DRIVERS
 
-source "drivers/media/video/zoran/Kconfig"
+source "drivers/media/video/au0828/Kconfig"
+
+source "drivers/media/video/bt8xx/Kconfig"
+
+source "drivers/media/video/cx18/Kconfig"
+
+source "drivers/media/video/cx23885/Kconfig"
+
+source "drivers/media/video/cx25821/Kconfig"
+
+source "drivers/media/video/cx88/Kconfig"
+
+config VIDEO_HEXIUM_GEMINI
+        tristate "Hexium Gemini frame grabber"
+        depends on PCI && VIDEO_V4L2 && I2C
+        select VIDEO_SAA7146_VV
+        ---help---
+          This is a video4linux driver for the Hexium Gemini frame
+          grabber card by Hexium. Please note that the Gemini Dual
+          card is *not* fully supported.
+
+          To compile this driver as a module, choose M here: the
+          module will be called hexium_gemini.
+
+config VIDEO_HEXIUM_ORION
+        tristate "Hexium HV-PCI6 and Orion frame grabber"
+        depends on PCI && VIDEO_V4L2 && I2C
+        select VIDEO_SAA7146_VV
+        ---help---
+          This is a video4linux driver for the Hexium HV-PCI6 and
+          Orion frame grabber cards by Hexium.
+
+          To compile this driver as a module, choose M here: the
+          module will be called hexium_orion.
+
+source "drivers/media/video/ivtv/Kconfig"
 
 config VIDEO_MEYE
         tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
@@ -688,8 +740,6 @@ config VIDEO_MEYE
           To compile this driver as a module, choose M here: the
           module will be called meye.
 
-source "drivers/media/video/saa7134/Kconfig"
-
 config VIDEO_MXB
         tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
         depends on PCI && VIDEO_V4L2 && I2C
@@ -706,28 +756,119 @@ config VIDEO_MXB
           To compile this driver as a module, choose M here: the
           module will be called mxb.
 
-config VIDEO_HEXIUM_ORION
-        tristate "Hexium HV-PCI6 and Orion frame grabber"
-        depends on PCI && VIDEO_V4L2 && I2C
-        select VIDEO_SAA7146_VV
+source "drivers/media/video/saa7134/Kconfig"
+
+source "drivers/media/video/saa7164/Kconfig"
+
+source "drivers/media/video/zoran/Kconfig"
+
+endif # V4L_PCI_DRIVERS
+
+#
+# ISA & parallel port drivers configuration
+#
+
+menuconfig V4L_ISA_PARPORT_DRIVERS
+        bool "V4L ISA and parallel port devices"
+        depends on ISA || PARPORT
+        default n
         ---help---
-          This is a video4linux driver for the Hexium HV-PCI6 and
-          Orion frame grabber cards by Hexium.
+          Say Y here to enable support for these ISA and parallel port drivers.
+
+if V4L_ISA_PARPORT_DRIVERS
+
+config VIDEO_BWQCAM
+        tristate "Quickcam BW Video For Linux"
+        depends on PARPORT && VIDEO_V4L2
+        help
+          Say Y have if you the black and white version of the QuickCam
+          camera. See the next option for the color version.
 
           To compile this driver as a module, choose M here: the
-          module will be called hexium_orion.
+          module will be called bw-qcam.
 
-config VIDEO_HEXIUM_GEMINI
-        tristate "Hexium Gemini frame grabber"
-        depends on PCI && VIDEO_V4L2 && I2C
-        select VIDEO_SAA7146_VV
-        ---help---
-          This is a video4linux driver for the Hexium Gemini frame
-          grabber card by Hexium. Please note that the Gemini Dual
-          card is *not* fully supported.
+config VIDEO_CQCAM
+        tristate "QuickCam Colour Video For Linux"
+        depends on PARPORT && VIDEO_V4L2
+        help
+          This is the video4linux driver for the colour version of the
+          Connectix QuickCam.  If you have one of these cameras, say Y here,
+          otherwise say N.  This driver does not work with the original
+          monochrome QuickCam, QuickCam VC or QuickClip.  It is also available
+          as a module (c-qcam).
+          Read <file:Documentation/video4linux/CQcam.txt> for more information.
+
+config VIDEO_PMS
+        tristate "Mediavision Pro Movie Studio Video For Linux"
+        depends on ISA && VIDEO_V4L2
+        help
+          Say Y if you have the ISA Mediavision Pro Movie Studio
+          capture card.
 
           To compile this driver as a module, choose M here: the
-          module will be called hexium_gemini.
+          module will be called pms.
+
+config VIDEO_W9966
+        tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux"
+        depends on PARPORT_1284 && PARPORT && VIDEO_V4L2
+        help
+          Video4linux driver for Winbond's w9966 based Webcams.
+          Currently tested with the LifeView FlyCam Supra.
+          If you have one of these cameras, say Y here
+          otherwise say N.
+          This driver is also available as a module (w9966).
+
+          Check out <file:Documentation/video4linux/w9966.txt> for more
+          information.
+
+endif # V4L_ISA_PARPORT_DRIVERS
+
+menuconfig V4L_PLATFORM_DRIVERS
+        bool "V4L platform devices"
+        default n
+        ---help---
+          Say Y here to enable support for platform-specific V4L drivers.
+
+if V4L_PLATFORM_DRIVERS
+
+source "drivers/media/video/marvell-ccic/Kconfig"
+
+config VIDEO_VIA_CAMERA
+        tristate "VIAFB camera controller support"
+        depends on FB_VIA
+        select VIDEOBUF_DMA_SG
+        select VIDEO_OV7670
+        help
+           Driver support for the integrated camera controller in VIA
+           Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems
+           with ov7670 sensors.
+
+#
+# Platform multimedia device configuration
+#
+
+source "drivers/media/video/davinci/Kconfig"
+
+source "drivers/media/video/omap/Kconfig"
+
+config VIDEO_SH_VOU
+        tristate "SuperH VOU video output driver"
+        depends on VIDEO_DEV && ARCH_SHMOBILE
+        select VIDEOBUF_DMA_CONTIG
+        help
+          Support for the Video Output Unit (VOU) on SuperH SoCs.
+
+config VIDEO_VIU
+        tristate "Freescale VIU Video Driver"
+        depends on VIDEO_V4L2 && PPC_MPC512x
+        select VIDEOBUF_DMA_CONTIG
+        default y
+        ---help---
+          Support for Freescale VIU video driver. This device captures
+          video data, or overlays video on DIU frame buffer.
+
+          Say Y here if you want to enable VIU device on MPC5121e Rev2+.
+          In doubt, say N.
 
 config VIDEO_TIMBERDALE
         tristate "Support for timberdale Video In/LogiWIN"
@@ -739,21 +880,13 @@ config VIDEO_TIMBERDALE
         ---help---
           Add support for the Video In peripherial of the timberdale FPGA.
 
-source "drivers/media/video/cx88/Kconfig"
-
-source "drivers/media/video/cx23885/Kconfig"
-
-source "drivers/media/video/cx25821/Kconfig"
-
-source "drivers/media/video/au0828/Kconfig"
-
-source "drivers/media/video/ivtv/Kconfig"
-
-source "drivers/media/video/cx18/Kconfig"
-
-source "drivers/media/video/saa7164/Kconfig"
-
-source "drivers/media/video/marvell-ccic/Kconfig"
+config VIDEO_VINO
+        tristate "SGI Vino Video For Linux"
+        depends on I2C && SGI_IP22 && VIDEO_V4L2
+        select VIDEO_SAA7191 if VIDEO_HELPER_CHIPS_AUTO
+        help
+          Say Y here to build in support for the Vino video input system found
+          on SGI Indy machines.
 
 config VIDEO_M32R_AR
         tristate "AR devices"
@@ -774,16 +907,6 @@ config VIDEO_M32R_AR_M64278
           To compile this driver as a module, choose M here: the
           module will be called arv.
 
-config VIDEO_VIA_CAMERA
-        tristate "VIAFB camera controller support"
-        depends on FB_VIA
-        select VIDEOBUF_DMA_SG
-        select VIDEO_OV7670
-        help
-           Driver support for the integrated camera controller in VIA
-           Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems
-           with ov7670 sensors.
-
 config VIDEO_OMAP3
         tristate "OMAP 3 Camera support (EXPERIMENTAL)"
         depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
@@ -1002,78 +1125,7 @@ config VIDEO_S5P_MIPI_CSIS
 
 source "drivers/media/video/s5p-tv/Kconfig"
 
-#
-# USB Multimedia device configuration
-#
-
-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/hdpvr/Kconfig"
-
-source "drivers/media/video/em28xx/Kconfig"
-
-source "drivers/media/video/tlg2300/Kconfig"
-
-source "drivers/media/video/cx231xx/Kconfig"
-
-source "drivers/media/video/tm6000/Kconfig"
-
-source "drivers/media/video/usbvision/Kconfig"
-
-source "drivers/media/video/et61x251/Kconfig"
-
-source "drivers/media/video/sn9c102/Kconfig"
-
-source "drivers/media/video/pwc/Kconfig"
-
-config USB_ZR364XX
-        tristate "USB ZR364XX Camera support"
-        depends on VIDEO_V4L2
-        select VIDEOBUF_GEN
-        select VIDEOBUF_VMALLOC
-        ---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://sourceforge.net/projects/syntekdriver/>
-
-          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
+endif # V4L_PLATFORM_DRIVERS
 endif # VIDEO_CAPTURE_DRIVERS
 
 menuconfig V4L_MEM2MEM_DRIVERS
@@ -1098,6 +1150,23 @@ config VIDEO_MEM2MEM_TESTDEV
           This is a virtual test device for the memory-to-memory driver
           framework.
 
+config VIDEO_SAMSUNG_S5P_G2D
+        tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
+        depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P
+        select VIDEOBUF2_DMA_CONTIG
+        select V4L2_MEM2MEM_DEV
+        default n
+        ---help---
+          This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D
+          2d graphics accelerator.
+
+config VIDEO_SAMSUNG_S5P_JPEG
+        tristate "Samsung S5P/Exynos4 JPEG codec driver (EXPERIMENTAL)"
+        depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P && EXPERIMENTAL
+        select VIDEOBUF2_DMA_CONTIG
+        select V4L2_MEM2MEM_DEV
+        ---help---
+          This is a v4l2 driver for Samsung S5P and EXYNOS4 JPEG codec
 
 config VIDEO_SAMSUNG_S5P_MFC
         tristate "Samsung S5P MFC 5.1 Video Codec"