[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1313577276-18182-1-git-send-email-deepthy.ravi@ti.com>
Date: Wed, 17 Aug 2011 16:04:36 +0530
From: Deepthy Ravi <deepthy.ravi@...com>
To: <mchehab@...radead.org>, <linux-media@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
CC: <linux-omap@...r.kernel.org>, Vaibhav Hiremath <hvaibhav@...com>,
Deepthy Ravi <deepthy.ravi@...com>
Subject: [PATCH] Media controller: Define media_entity_init() and media_entity_cleanup() conditionally
From: Vaibhav Hiremath <hvaibhav@...com>
Defines the two functions only when CONFIG_MEDIA_CONTROLLER
is enabled.
Signed-off-by: Vaibhav Hiremath <hvaibhav@...com>
Signed-off-by: Deepthy Ravi <deepthy.ravi@...com>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists