Merge remote-tracking branch 'v4l-dvb/master'

[karo-tx-linux.git] / drivers / media / platform / soc_camera / soc_camera.c

diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 9087fed586fba29281d2a24c7500096a77339bf9..dc98122e78dc503a8a0c02d3fdcd03f3093c093e 100644 (file)
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -38,7 +38,7 @@
 #include <media/v4l2-dev.h>
 #include <media/v4l2-of.h>
 #include <media/videobuf-core.h>
-#include <media/videobuf2-core.h>
+#include <media/videobuf2-v4l2.h>
 
 /* Default to VGA resolution */
 #define DEFAULT_WIDTH  640
@@ -1631,7 +1631,7 @@ static int soc_of_bind(struct soc_camera_host *ici,
        struct soc_camera_async_client *sasc;
        struct soc_of_info *info;
        struct i2c_client *client;
-       char clk_name[V4L2_SUBDEV_NAME_SIZE];
+       char clk_name[V4L2_SUBDEV_NAME_SIZE + 32];
        int ret;
 
        /* allocate a new subdev and add match info to it */