git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[pandora-kernel.git]
/
drivers
/
media
/
video
/
zoran_driver.c
diff --git
a/drivers/media/video/zoran_driver.c
b/drivers/media/video/zoran_driver.c
index
5394d7a
..
c067592
100644
(file)
--- a/
drivers/media/video/zoran_driver.c
+++ b/
drivers/media/video/zoran_driver.c
@@
-94,7
+94,6
@@
V4L2_CAP_VIDEO_OVERLAY \
)
V4L2_CAP_VIDEO_OVERLAY \
)
-#include <asm/byteorder.h>
#if defined(CONFIG_VIDEO_V4L1_COMPAT)
#define ZFMT(pal, fcc, cs) \
#if defined(CONFIG_VIDEO_V4L1_COMPAT)
#define ZFMT(pal, fcc, cs) \
@@
-2795,7
+2794,7
@@
zoran_do_ioctl (struct inode *inode,
{
struct v4l2_format *fmt = arg;
int i, res = 0;
{
struct v4l2_format *fmt = arg;
int i, res = 0;
- __
u
32 printformat;
+ __
le
32 printformat;
dprintk(3, KERN_DEBUG "%s: VIDIOC_S_FMT - type=%d, ",
ZR_DEVNAME(zr), fmt->type);
dprintk(3, KERN_DEBUG "%s: VIDIOC_S_FMT - type=%d, ",
ZR_DEVNAME(zr), fmt->type);
@@
-3040,7
+3039,7
@@
zoran_do_ioctl (struct inode *inode,
{
int i, res = 0;
struct v4l2_framebuffer *fb = arg;
{
int i, res = 0;
struct v4l2_framebuffer *fb = arg;
- __
u
32 printformat = __cpu_to_le32(fb->fmt.pixelformat);
+ __
le
32 printformat = __cpu_to_le32(fb->fmt.pixelformat);
dprintk(3,
KERN_DEBUG
dprintk(3,
KERN_DEBUG