Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[karo-tx-linux.git] / include / media / sh_mobile_csi2.h

diff --git a/include/media/sh_mobile_csi2.h b/include/media/sh_mobile_csi2.h
index c586c4f7f16bb261378f3850034f6f8186fa4510..14030db51f131ab845277c3c1b879affbb67e9ff 100644 (file)
--- a/include/media/sh_mobile_csi2.h
+++ b/include/media/sh_mobile_csi2.h
@@ -33,6 +33,7 @@ struct sh_csi2_client_config {
        unsigned char lanes;            /* bitmask[3:0] */
        unsigned char channel;          /* 0..3 */
        struct platform_device *pdev;   /* client platform device */
+       const char *name;               /* async matching: client name */
 };
 
 struct v4l2_device;
@@ -42,7 +43,6 @@ struct sh_csi2_pdata {
        unsigned int flags;
        struct sh_csi2_client_config *clients;
        int num_clients;
-       struct v4l2_device *v4l2_dev;
 };
 
 #endif