diff options
author | Shuah Khan <shuahkh@osg.samsung.com> | 2015-06-05 16:11:54 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 09:05:48 -0500 |
commit | e576d60bb21e7add884f052ff0e5c28ebf7b7461 (patch) | |
tree | 9fdca34693e5dcab450a1bdcee20817332bd5c6b /drivers/media/media-device.c | |
parent | d062f91193dbd5a0c1d8469c8517ec8dd552c3f2 (diff) |
[media] media: define Media Controller API when CONFIG_MEDIA_CONTROLLER enabled
Change to define Media Controller API when CONFIG_MEDIA_CONTROLLER
is enabled. Define stubs for CONFIG_MEDIA_CONTROLLER disabled case.
This will help avoid drivers needing to enclose Media Controller
code within ifdef CONFIG_MEDIA_CONTROLLER block.
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/media-device.c')
-rw-r--r-- | drivers/media/media-device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index a4d5b2488c05..c55ab5029323 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c | |||
@@ -30,6 +30,8 @@ | |||
30 | #include <media/media-devnode.h> | 30 | #include <media/media-devnode.h> |
31 | #include <media/media-entity.h> | 31 | #include <media/media-entity.h> |
32 | 32 | ||
33 | #ifdef CONFIG_MEDIA_CONTROLLER | ||
34 | |||
33 | /* ----------------------------------------------------------------------------- | 35 | /* ----------------------------------------------------------------------------- |
34 | * Userspace API | 36 | * Userspace API |
35 | */ | 37 | */ |
@@ -495,3 +497,5 @@ struct media_device *media_device_find_devres(struct device *dev) | |||
495 | return devres_find(dev, media_device_release_devres, NULL, NULL); | 497 | return devres_find(dev, media_device_release_devres, NULL, NULL); |
496 | } | 498 | } |
497 | EXPORT_SYMBOL_GPL(media_device_find_devres); | 499 | EXPORT_SYMBOL_GPL(media_device_find_devres); |
500 | |||
501 | #endif /* CONFIG_MEDIA_CONTROLLER */ | ||