Merge commit 'v2.6.29-rc1' into core/urgent

[linux-2.6-omap-h63xx.git] / drivers / media / video / gspca / Kconfig

diff --git a/drivers/media/video/gspca/Kconfig b/drivers/media/video/gspca/Kconfig
index fdd4f653753c6c0ef05ae2b01c340687608e93fe..ee6a691dff229d9d597b5ac9cd1b101294872ab3 100644 (file)
--- a/drivers/media/video/gspca/Kconfig
+++ b/drivers/media/video/gspca/Kconfig
@@ -18,6 +18,7 @@ menuconfig USB_GSPCA
 if USB_GSPCA && VIDEO_V4L2
 
 source "drivers/media/video/gspca/m5602/Kconfig"
+source "drivers/media/video/gspca/stv06xx/Kconfig"
 
 config USB_GSPCA_CONEX
        tristate "Conexant Camera Driver"
@@ -64,6 +65,16 @@ config USB_GSPCA_OV519
          To compile this driver as a module, choose M here: the
          module will be called gspca_ov519.
 
+config USB_GSPCA_OV534
+       tristate "OV534 USB Camera Driver"
+       depends on VIDEO_V4L2 && USB_GSPCA
+       help
+         Say Y here if you want support for cameras based on the OV534 chip.
+         (e.g. Sony Playstation EYE)
+
+         To compile this driver as a module, choose M here: the
+         module will be called gspca_ov534.
+
 config USB_GSPCA_PAC207
        tristate "Pixart PAC207 USB Camera Driver"
        depends on VIDEO_V4L2 && USB_GSPCA