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

[mv-sheeva.git] / include / media / atmel-isi.h

diff --git a/include/media/atmel-isi.h b/include/media/atmel-isi.h
index 26cece5951218072e249327561ba5289c60575d7..656823075709d6728cc2b2ec182e4827d5b319f1 100644 (file)
--- a/include/media/atmel-isi.h
+++ b/include/media/atmel-isi.h
@@ -110,10 +110,12 @@ struct isi_platform_data {
        u8 hsync_act_low;
        u8 vsync_act_low;
        u8 pclk_act_falling;
-       u8 isi_full_mode;
+       u8 full_mode;
        u32 data_width_flags;
        /* Using for ISI_CFG1 */
        u32 frate;
+       /* Using for ISI_MCK */
+       u32 mck_hz;
 };
 
 #endif /* __ATMEL_ISI_H__ */