Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[cascardo/linux.git] / drivers / media / platform / s3c-camif / camif-core.h

diff --git a/drivers/media/platform/s3c-camif/camif-core.h b/drivers/media/platform/s3c-camif/camif-core.h
index 57cbc3d..1f5c8c9 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-core.h
+++ b/drivers/media/platform/s3c-camif/camif-core.h
@@ -254,7 +254,6 @@ struct camif_vp {
  * @ctrl_handler: v4l2 control handler (owned by @subdev)
  * @test_pattern: test pattern controls
  * @vp:           video path (DMA) description (codec/preview)
- * @alloc_ctx:    memory buffer allocator context
  * @variant:      variant information for this device
  * @dev:         pointer to the CAMIF device struct
  * @pdata:       a copy of the driver's platform data
@@ -291,7 +290,6 @@ struct camif_dev {
        u8                              colorfx_cr;
 
        struct camif_vp                 vp[CAMIF_VP_NUM];
-       struct vb2_alloc_ctx            *alloc_ctx;
 
        const struct s3c_camif_variant  *variant;
        struct device                   *dev;