Merge tag 'tpmdd-next-20151110' of https://github.com/jsakkine/linux-tpmdd into for...

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / soc_camera / atmel-isi.h

diff --git a/drivers/media/platform/soc_camera/atmel-isi.h b/drivers/media/platform/soc_camera/atmel-isi.h
index e7a96b85e37468b4af1631edc6fe6fd83ad6ac08..5acc771d2edcd61d2b4f2d6f7f1507c4f4422ffa 100644 (file)
--- a/drivers/media/platform/soc_camera/atmel-isi.h
+++ b/drivers/media/platform/soc_camera/atmel-isi.h
@@ -116,7 +116,6 @@ struct v4l2_async_subdev;
 
 struct isi_platform_data {
        u8 has_emb_sync;
-       u8 emb_crc_sync;
        u8 hsync_act_low;
        u8 vsync_act_low;
        u8 pclk_act_falling;
@@ -124,10 +123,6 @@ struct isi_platform_data {
        u32 data_width_flags;
        /* Using for ISI_CFG1 */
        u32 frate;
-       /* Using for ISI_MCK */
-       u32 mck_hz;
-       struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */
-       int *asd_sizes;         /* 0-terminated array of asd group sizes */
 };
 
 #endif /* __ATMEL_ISI_H__ */