Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / media / platform / soc_camera / soc_camera_platform.c

diff --git a/drivers/media/platform/soc_camera/soc_camera_platform.c b/drivers/media/platform/soc_camera/soc_camera_platform.c
index ceaddfb85e492f6551a4c12fab5565c3f5f28e33..f535910b4187dbc006e104399b2c1dee30aa97a0 100644 (file)
--- a/drivers/media/platform/soc_camera/soc_camera_platform.c
+++ b/drivers/media/platform/soc_camera/soc_camera_platform.c
@@ -62,7 +62,7 @@ static struct v4l2_subdev_core_ops platform_subdev_core_ops = {
 };
 
 static int soc_camera_platform_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                                       enum v4l2_mbus_pixelcode *code)
+                                       u32 *code)
 {
        struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
 
@@ -180,7 +180,6 @@ static int soc_camera_platform_remove(struct platform_device *pdev)
 static struct platform_driver soc_camera_platform_driver = {
        .driver         = {
                .name   = "soc_camera_platform",
-               .owner  = THIS_MODULE,
        },
        .probe          = soc_camera_platform_probe,
        .remove         = soc_camera_platform_remove,