diff options
Diffstat (limited to 'kernel/drivers/staging/media/omap4iss/iss_video.h')
-rw-r--r-- | kernel/drivers/staging/media/omap4iss/iss_video.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/drivers/staging/media/omap4iss/iss_video.h b/kernel/drivers/staging/media/omap4iss/iss_video.h index f11fce2cb..41532eda1 100644 --- a/kernel/drivers/staging/media/omap4iss/iss_video.h +++ b/kernel/drivers/staging/media/omap4iss/iss_video.h @@ -18,7 +18,7 @@ #include <media/media-entity.h> #include <media/v4l2-dev.h> #include <media/v4l2-fh.h> -#include <media/videobuf2-core.h> +#include <media/videobuf2-v4l2.h> #include <media/videobuf2-dma-contig.h> #define ISS_VIDEO_DRIVER_NAME "issvideo" @@ -117,12 +117,12 @@ static inline int iss_pipeline_ready(struct iss_pipeline *pipe) */ struct iss_buffer { /* common v4l buffer stuff -- must be first */ - struct vb2_buffer vb; + struct vb2_v4l2_buffer vb; struct list_head list; dma_addr_t iss_addr; }; -#define to_iss_buffer(buf) container_of(buf, struct iss_buffer, buffer) +#define to_iss_buffer(buf) container_of(buf, struct iss_buffer, vb) enum iss_video_dmaqueue_flags { /* Set if DMA queue becomes empty when ISS_PIPELINE_STREAM_CONTINUOUS */ |