[media] V4L: replace soc-camera specific soc_mediabus.h with v4l2-mediabus.h
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Fri, 9 Sep 2011 16:56:04 +0000 (13:56 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 3 Nov 2011 20:29:04 +0000 (18:29 -0200)
Most users of the <media/soc_mediabus.h> header only need pixel code
definitions, which are now located in the generic <linux/v4l2-mediabus.h>
header. Switch over to reduce soc-camera dependencies.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
12 files changed:
drivers/media/video/imx074.c
drivers/media/video/mt9m111.c
drivers/media/video/mt9t031.c
drivers/media/video/mt9t112.c
drivers/media/video/ov2640.c
drivers/media/video/ov5642.c
drivers/media/video/ov6650.c
drivers/media/video/ov772x.c
drivers/media/video/ov9640.c
drivers/media/video/ov9740.c
drivers/media/video/rj54n1cb0c.c
drivers/media/video/tw9910.c

index 4f3ce7fa87dfaeba0c539a3f21ba0daa2be3ca31..8775e262bb6e8b9f42f19a467ed37ec806ff79e4 100644 (file)
 
 #include <linux/delay.h>
 #include <linux/i2c.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
 
index 9feeb0cb6722a9a05c83dc33d16bd43a68d52477..f023cc092c2b8ea6d435daaf77e802ae74ef0ad3 100644 (file)
@@ -13,9 +13,9 @@
 #include <linux/log2.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
 
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-chip-ident.h>
index 0226486d59bea74901bd345374b9bc4a5eb68b9c..7ee84cc578b9d2d018358bb6d1a44b7415fdb994 100644 (file)
 #include <linux/log2.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
 
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-ctrls.h>
index 5b045a1097c6f2e8f3bbb03858f7fbea226a3cff..32114a3c0ca78daa889853893d5fb066f8476cf9 100644 (file)
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
 
 #include <media/mt9t112.h>
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-common.h>
 
index d37a5cceebb671c4516230a65bdbe79889bcfaf6..b5247cb64fdea1510774e48cbddf3b68f4508abb 100644 (file)
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
 
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-ctrls.h>
index 2a26602fc86d9a20b6dcc0e7583a8388fa5bc56c..54178cbeabb4c7e171bd20692b81ba3ad8a7a17f 100644 (file)
@@ -19,9 +19,9 @@
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <linux/module.h>
+#include <linux/v4l2-mediabus.h>
 
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>
 
index eb296f9e69f418cb3ee8e6ad44bbf04f738d7ecb..8d17c519a9f767841ffb01ed575fba0e01d11982 100644 (file)
@@ -28,9 +28,9 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
 
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-ctrls.h>
 
index a2146c30771e8fcac923d1acd9c6c0f4e93ea05e..9f6ce3d8a29efc9f1652cb21e8f9768ddc2ea345 100644 (file)
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
 
 #include <media/ov772x.h>
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>
index f9babf39d802b77000248c31e343a7bfe6057ae2..a4f99797eb56b71b2a2cb08218e4dee495276527 100644 (file)
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
 
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ctrls.h>
index 9558aca86818bc91187f8a1cada8f50e9c2ee62f..d9a9f7174f7a1e09a03972d8a84b984d60b70d91 100644 (file)
@@ -14,9 +14,9 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
 
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-ctrls.h>
 
index fcb14d93a24c6f45b618e88a93ceba2fd5469a5c..6afc6168954926cb0f4715150798ea217255ca79 100644 (file)
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
 
 #include <media/rj54n1cb0c.h>
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-ctrls.h>
index efce5371915e1738ac9d5dabf75415d8c81ef8b7..a514fa61116c5a63c5492ef8d68b72484a4b39c4 100644 (file)
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/v4l2-mediabus.h>
 #include <linux/videodev2.h>
 
 #include <media/soc_camera.h>
-#include <media/soc_mediabus.h>
 #include <media/tw9910.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-subdev.h>