projects
/
linux-2.6-microblaze.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-microblaze.git]
/
drivers
/
media
/
platform
/
s5p-tv
/
sdo_drv.c
diff --git
a/drivers/media/platform/s5p-tv/sdo_drv.c
b/drivers/media/platform/s5p-tv/sdo_drv.c
index
0dfe51a
..
3621af9
100644
(file)
--- a/
drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/
drivers/media/platform/s5p-tv/sdo_drv.c
@@
-170,7
+170,7
@@
static int sdo_g_mbus_fmt(struct v4l2_subdev *sd,
/* all modes are 720 pixels wide */
fmt->width = 720;
fmt->height = sdev->fmt->height;
- fmt->code =
V4L2_M
BUS_FMT_FIXED;
+ fmt->code =
MEDIA_
BUS_FMT_FIXED;
fmt->field = V4L2_FIELD_INTERLACED;
fmt->colorspace = V4L2_COLORSPACE_JPEG;
return 0;