From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepthy Ravi Subject: [PATCH] Media controller: Define media_entity_init() and media_entity_cleanup() conditionally Date: Wed, 17 Aug 2011 16:04:36 +0530 Message-ID: <1313577276-18182-1-git-send-email-deepthy.ravi@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Sender: linux-media-owner@vger.kernel.org To: mchehab@infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-omap@vger.kernel.org, Vaibhav Hiremath , Deepthy Ravi List-Id: linux-omap@vger.kernel.org From: Vaibhav Hiremath Defines the two functions only when CONFIG_MEDIA_CONTROLLER is enabled. Signed-off-by: Vaibhav Hiremath Signed-off-by: Deepthy Ravi --- include/media/media-entity.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/media/media-entity.h b/include/media/media-entity.h index cd8bca6..c90916e 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -121,9 +121,18 @@ struct media_entity_graph { int top; }; +#ifdef CONFIG_MEDIA_CONTROLLER int media_entity_init(struct media_entity *entity, u16 num_pads, struct media_pad *pads, u16 extra_links); void media_entity_cleanup(struct media_entity *entity); +#else +static inline int media_entity_init(struct media_entity *entity, u16 num_pads, + struct media_pad *pads, u16 extra_links) +{ + return 0; +} +static inline void media_entity_cleanup(struct media_entity *entity) {} +#endif int media_entity_create_link(struct media_entity *source, u16 source_pad, struct media_entity *sink, u16 sink_pad, u32 flags); -- 1.7.0.4