summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSylwester Nawrocki2010-12-27 18:42:15 +0100
committerMauro Carvalho Chehab2011-03-22 00:31:38 +0100
commitdf7e09a351199ad9a70eb9ae3b072cc4fc59a9bb (patch)
tree10f13ac25df04a343f4cca9e0cd9b2f67bda3e87 /include
parent[media] s5p-fimc: Use v4l core mutex in ioctl and file operations (diff)
downloadkernel-qcow2-linux-df7e09a351199ad9a70eb9ae3b072cc4fc59a9bb.tar.gz
kernel-qcow2-linux-df7e09a351199ad9a70eb9ae3b072cc4fc59a9bb.tar.xz
kernel-qcow2-linux-df7e09a351199ad9a70eb9ae3b072cc4fc59a9bb.zip
[media] s5p-fimc: Rename s3c_fimc* to s5p_fimc*
Change s3c_fimc.h header file name to s5p_fimc.h, replace s3c_fimc_* names with s5p_fimc_*. s3c_fimc need to be reserved for S3C series and s5p-fimc driver will not cover CAMIF devices in S3C SoC series. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/s5p_fimc.h (renamed from include/media/s3c_fimc.h)16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/media/s3c_fimc.h b/include/media/s5p_fimc.h
index ca1b6738e4a4..eb8793fd150e 100644
--- a/include/media/s3c_fimc.h
+++ b/include/media/s5p_fimc.h
@@ -9,8 +9,8 @@
* published by the Free Software Foundation.
*/
-#ifndef S3C_FIMC_H_
-#define S3C_FIMC_H_
+#ifndef S5P_FIMC_H_
+#define S5P_FIMC_H_
enum cam_bus_type {
FIMC_ITU_601 = 1,
@@ -27,7 +27,7 @@ enum cam_bus_type {
struct i2c_board_info;
/**
- * struct s3c_fimc_isp_info - image sensor information required for host
+ * struct s5p_fimc_isp_info - image sensor information required for host
* interace configuration.
*
* @board_info: pointer to I2C subdevice's board info
@@ -37,7 +37,7 @@ struct i2c_board_info;
* @bus_width: camera data bus width in bits
* @flags: flags defining bus signals polarity inversion (High by default)
*/
-struct s3c_fimc_isp_info {
+struct s5p_fimc_isp_info {
struct i2c_board_info *board_info;
enum cam_bus_type bus_type;
u16 i2c_bus_num;
@@ -50,11 +50,11 @@ struct s3c_fimc_isp_info {
#define FIMC_MAX_CAMIF_CLIENTS 2
/**
- * struct s3c_platform_fimc - camera host interface platform data
+ * struct s5p_platform_fimc - camera host interface platform data
*
* @isp_info: properties of camera sensor required for host interface setup
*/
-struct s3c_platform_fimc {
- struct s3c_fimc_isp_info *isp_info[FIMC_MAX_CAMIF_CLIENTS];
+struct s5p_platform_fimc {
+ struct s5p_fimc_isp_info *isp_info[FIMC_MAX_CAMIF_CLIENTS];
};
-#endif /* S3C_FIMC_H_ */
+#endif /* S5P_FIMC_H_ */