Merge branch 'topic/vsp1' into patchwork

[linux-2.6-block.git] / drivers / media / platform / vsp1 / vsp1_video.h

diff --git a/drivers/media/platform/vsp1/vsp1_video.h b/drivers/media/platform/vsp1/vsp1_video.h
index 1595fd587fbca4a499de7dd3334ed3e271846e16..50ea7f02205f1800cc39e81ba8961fd91453a6e5 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_video.h
+++ b/drivers/media/platform/vsp1/vsp1_video.h
@@ -46,7 +46,6 @@ struct vsp1_video {
        unsigned int pipe_index;
 
        struct vb2_queue queue;
-       void *alloc_ctx;
        spinlock_t irqlock;
        struct list_head irqqueue;
 };