Merge branch 'samsung_platform_data' into staging/for_v3.7

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

diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
similarity index 99%
rename from drivers/media/video/mx3_camera.c
rename to drivers/media/platform/soc_camera/mx3_camera.c
index 1481b0d419da8da4c8874c01cc26cd7d5703bac2..3557ac97e4303f4743330850a5144f43cb06cbd0 100644 (file)
--- a/drivers/media/video/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -1171,9 +1171,7 @@ static int __devinit mx3_camera_probe(struct platform_device *pdev)
 
        mx3_cam->pdata = pdev->dev.platform_data;
        mx3_cam->platform_flags = mx3_cam->pdata->flags;
-       if (!(mx3_cam->platform_flags & (MX3_CAMERA_DATAWIDTH_4 |
-                       MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10 |
-                       MX3_CAMERA_DATAWIDTH_15))) {
+       if (!(mx3_cam->platform_flags & MX3_CAMERA_DATAWIDTH_MASK)) {
                /*
                 * Platform hasn't set available data widths. This is bad.
                 * Warn and use a default.