diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 10:48:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 10:48:37 -0400 |
| commit | d50f58bbd979e86378dfdec982452041f0e604ef (patch) | |
| tree | 511938033b3346983175c70dd4d0afeb00b59b82 /drivers/media/video/Kconfig | |
| parent | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (diff) | |
| parent | 79d3c2c2395a89a70d25f0c77c11afc87efab89b (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'drivers/media/video/Kconfig')
| -rw-r--r-- | drivers/media/video/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index bdbc9d30541..27e2acce3c3 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -969,6 +969,19 @@ config VIDEO_OMAP2 | |||
| 969 | ---help--- | 969 | ---help--- |
| 970 | This is a v4l2 driver for the TI OMAP2 camera capture interface | 970 | This is a v4l2 driver for the TI OMAP2 camera capture interface |
| 971 | 971 | ||
| 972 | config VIDEO_MX2_HOSTSUPPORT | ||
| 973 | bool | ||
| 974 | |||
| 975 | config VIDEO_MX2 | ||
| 976 | tristate "i.MX27/i.MX25 Camera Sensor Interface driver" | ||
| 977 | depends on VIDEO_DEV && SOC_CAMERA && (MACH_MX27 || ARCH_MX25) | ||
| 978 | select VIDEOBUF_DMA_CONTIG | ||
| 979 | select VIDEO_MX2_HOSTSUPPORT | ||
| 980 | ---help--- | ||
| 981 | This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor | ||
| 982 | Interface | ||
| 983 | |||
| 984 | |||
| 972 | # | 985 | # |
| 973 | # USB Multimedia device configuration | 986 | # USB Multimedia device configuration |
| 974 | # | 987 | # |