From ff2342384fd4729db6bbe03ea3ea86717bb7690d Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 2 May 2011 16:21:03 -0300 Subject: [PATCH] --- yaml --- r: 253246 b: refs/heads/master c: 6e3ea0e711b1c4dca3c4f87ef0ab5c896c940c81 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/media/v4l2-dev.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9947e53fab34..ec8ad8a8ca95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5874c9245d298c65f81c2f91f89e1da8ea66409 +refs/heads/master: 6e3ea0e711b1c4dca3c4f87ef0ab5c896c940c81 diff --git a/trunk/include/media/v4l2-dev.h b/trunk/include/media/v4l2-dev.h index 93e96fb93452..c7c40f1d2624 100644 --- a/trunk/include/media/v4l2-dev.h +++ b/trunk/include/media/v4l2-dev.h @@ -128,8 +128,8 @@ struct video_device struct mutex *lock; }; -#define media_entity_to_video_device(entity) \ - container_of(entity, struct video_device, entity) +#define media_entity_to_video_device(__e) \ + container_of(__e, struct video_device, entity) /* dev to video-device */ #define to_video_device(cd) container_of(cd, struct video_device, dev)