diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
| commit | d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch) | |
| tree | 854ab394486288d40fa8179cbfaf66e8bdc44b0f /drivers/media/video/Kconfig | |
| parent | 73b2c7165b76b20eb1290e7efebc33cfd21db1ca (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' into for-next
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 bdbc9d305419..27e2acce3c3a 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 | # |