diff options
author | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /drivers/media/video/vino.c | |
parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r-- | drivers/media/video/vino.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 3989b0eded2..1edda456fc6 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c @@ -39,7 +39,9 @@ #include <linux/i2c-algo-sgi.h> #include <linux/videodev2.h> +#include <media/v4l2-ioctl.h> #include <media/v4l2-common.h> +#include <media/v4l2-ioctl.h> #include <linux/video_decoder.h> #include <linux/mutex.h> |