projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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 22bd8290c09719a12bf60edafe8e6ec6c8356b8e..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);