From 5774be15f7fff7696eb45dd19288fb7fbe4d3bdd Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Sat, 5 Nov 2011 18:42:01 -0300
Subject: [PATCH] --- yaml --- r: 285390 b: refs/heads/master c:
 fa5034c667c224be48db31a0d043dba305e8e7a8 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/media-device.c      | 3 +--
 trunk/drivers/media/video/v4l2-dev.c    | 4 ++--
 trunk/drivers/media/video/v4l2-device.c | 4 ++--
 trunk/include/media/media-entity.h      | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index de69e1b05218..9ce96a15e432 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1026c580df130c1d1943fff99bae0bef2cafa7b
+refs/heads/master: fa5034c667c224be48db31a0d043dba305e8e7a8
diff --git a/trunk/drivers/media/media-device.c b/trunk/drivers/media/media-device.c
index 6edc9ba81203..6f9eb94e85b3 100644
--- a/trunk/drivers/media/media-device.c
+++ b/trunk/drivers/media/media-device.c
@@ -108,8 +108,7 @@ static long media_device_enum_entities(struct media_device *mdev,
 	u_ent.group_id = ent->group_id;
 	u_ent.pads = ent->num_pads;
 	u_ent.links = ent->num_links - ent->num_backlinks;
-	u_ent.v4l.major = ent->v4l.major;
-	u_ent.v4l.minor = ent->v4l.minor;
+	memcpy(&u_ent.raw, &ent->info, sizeof(ent->info));
 	if (copy_to_user(uent, &u_ent, sizeof(u_ent)))
 		return -EFAULT;
 	return 0;
diff --git a/trunk/drivers/media/video/v4l2-dev.c b/trunk/drivers/media/video/v4l2-dev.c
index 6a07d283456b..96e9615663e9 100644
--- a/trunk/drivers/media/video/v4l2-dev.c
+++ b/trunk/drivers/media/video/v4l2-dev.c
@@ -701,8 +701,8 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
 	    vdev->vfl_type != VFL_TYPE_SUBDEV) {
 		vdev->entity.type = MEDIA_ENT_T_DEVNODE_V4L;
 		vdev->entity.name = vdev->name;
-		vdev->entity.v4l.major = VIDEO_MAJOR;
-		vdev->entity.v4l.minor = vdev->minor;
+		vdev->entity.info.v4l.major = VIDEO_MAJOR;
+		vdev->entity.info.v4l.minor = vdev->minor;
 		ret = media_device_register_entity(vdev->v4l2_dev->mdev,
 			&vdev->entity);
 		if (ret < 0)
diff --git a/trunk/drivers/media/video/v4l2-device.c b/trunk/drivers/media/video/v4l2-device.c
index 0edd618b9ddf..1f203b85a637 100644
--- a/trunk/drivers/media/video/v4l2-device.c
+++ b/trunk/drivers/media/video/v4l2-device.c
@@ -234,8 +234,8 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)
 			goto clean_up;
 		}
 #if defined(CONFIG_MEDIA_CONTROLLER)
-		sd->entity.v4l.major = VIDEO_MAJOR;
-		sd->entity.v4l.minor = vdev->minor;
+		sd->entity.info.v4l.major = VIDEO_MAJOR;
+		sd->entity.info.v4l.minor = vdev->minor;
 #endif
 		sd->devnode = vdev;
 	}
diff --git a/trunk/include/media/media-entity.h b/trunk/include/media/media-entity.h
index cd8bca63a502..29e7bba78ffe 100644
--- a/trunk/include/media/media-entity.h
+++ b/trunk/include/media/media-entity.h
@@ -98,7 +98,7 @@ struct media_entity {
 
 		/* Sub-device specifications */
 		/* Nothing needed yet */
-	};
+	} info;
 };
 
 static inline u32 media_entity_type(struct media_entity *entity)