Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[uclinux-h8/linux.git] / include / media / media-entity.h

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index e004591..0c003d8 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -44,6 +44,15 @@ struct media_pad {
        unsigned long flags;            /* Pad flags (MEDIA_PAD_FL_*) */
 };
 
+/**
+ * struct media_entity_operations - Media entity operations
+ * @link_setup:                Notify the entity of link changes. The operation can
+ *                     return an error, in which case link setup will be
+ *                     cancelled. Optional.
+ * @link_validate:     Return whether a link is valid from the entity point of
+ *                     view. The media_entity_pipeline_start() function
+ *                     validates all links by calling this operation. Optional.
+ */
 struct media_entity_operations {
        int (*link_setup)(struct media_entity *entity,
                          const struct media_pad *local,
@@ -87,17 +96,7 @@ struct media_entity {
                struct {
                        u32 major;
                        u32 minor;
-               } v4l;
-               struct {
-                       u32 major;
-                       u32 minor;
-               } fb;
-               struct {
-                       u32 card;
-                       u32 device;
-                       u32 subdevice;
-               } alsa;
-               int dvb;
+               } dev;
 
                /* Sub-device specifications */
                /* Nothing needed yet */