summaryrefslogtreecommitdiff
path: root/drivers/media/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-03-28 15:03:58 +0400
committerTakashi Iwai <tiwai@suse.de>2011-03-28 15:03:58 +0400
commitcdccfc8dc0bf62a1da327324a8d639139acc9279 (patch)
treedca7934b27d510c9c006558979ebc48e07a531cf /drivers/media/Kconfig
parentb21a8ee67013372f439fbd1591e91d09de49bb9c (diff)
parentc6b358748e19ce7e230b0926ac42696bc485a562 (diff)
downloadlinux-cdccfc8dc0bf62a1da327324a8d639139acc9279.tar.xz
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/media/Kconfig')
-rw-r--r--drivers/media/Kconfig22
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 81b3ba83cc65..6995940b633a 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -14,6 +14,19 @@ if MEDIA_SUPPORT
comment "Multimedia core support"
#
+# Media controller
+#
+
+config MEDIA_CONTROLLER
+ bool "Media Controller API (EXPERIMENTAL)"
+ depends on EXPERIMENTAL
+ ---help---
+ Enable the media controller API used to query media devices internal
+ topology and configure it dynamically.
+
+ This API is mostly used by camera interfaces in embedded platforms.
+
+#
# V4L core and enabled API's
#
@@ -40,6 +53,15 @@ config VIDEO_V4L2_COMMON
depends on (I2C || I2C=n) && VIDEO_DEV
default (I2C || I2C=n) && VIDEO_DEV
+config VIDEO_V4L2_SUBDEV_API
+ bool "V4L2 sub-device userspace API (EXPERIMENTAL)"
+ depends on VIDEO_DEV && MEDIA_CONTROLLER && EXPERIMENTAL
+ ---help---
+ Enables the V4L2 sub-device pad-level userspace API used to configure
+ video format, size and frame rate between hardware blocks.
+
+ This API is mostly used by camera interfaces in embedded platforms.
+
#
# DVB Core
#