diff options
Diffstat (limited to 'drivers/media/video/zoran_driver.c')
-rw-r--r-- | drivers/media/video/zoran_driver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index b2c6e01e3923..b5a576a37fd2 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c | |||
@@ -94,7 +94,7 @@ | |||
94 | V4L2_CAP_VIDEO_CAPTURE |\ | 94 | V4L2_CAP_VIDEO_CAPTURE |\ |
95 | V4L2_CAP_VIDEO_OUTPUT |\ | 95 | V4L2_CAP_VIDEO_OUTPUT |\ |
96 | V4L2_CAP_VIDEO_OVERLAY \ | 96 | V4L2_CAP_VIDEO_OVERLAY \ |
97 | ) | 97 | ) |
98 | #endif | 98 | #endif |
99 | 99 | ||
100 | #include <asm/byteorder.h> | 100 | #include <asm/byteorder.h> |
@@ -165,7 +165,7 @@ const struct zoran_format zoran_formats[] = { | |||
165 | #endif | 165 | #endif |
166 | .depth = 16, | 166 | .depth = 16, |
167 | .flags = ZORAN_FORMAT_CAPTURE | | 167 | .flags = ZORAN_FORMAT_CAPTURE | |
168 | ZORAN_FORMAT_OVERLAY, | 168 | ZORAN_FORMAT_OVERLAY, |
169 | }, { | 169 | }, { |
170 | .name = "Hardware-encoded Motion-JPEG", | 170 | .name = "Hardware-encoded Motion-JPEG", |
171 | .palette = -1, | 171 | .palette = -1, |
@@ -670,7 +670,7 @@ jpg_fbuffer_free (struct file *file) | |||
670 | j])))); | 670 | j])))); |
671 | free_page((unsigned long) | 671 | free_page((unsigned long) |
672 | bus_to_virt | 672 | bus_to_virt |
673 | (le32_to_cpu | 673 | (le32_to_cpu |
674 | (fh->jpg_buffers. | 674 | (fh->jpg_buffers. |
675 | buffer[i]. | 675 | buffer[i]. |
676 | frag_tab[2 * j]))); | 676 | frag_tab[2 * j]))); |
@@ -1871,7 +1871,7 @@ zoran_v4l2_buffer_status (struct file *file, | |||
1871 | 1871 | ||
1872 | static int | 1872 | static int |
1873 | zoran_set_norm (struct zoran *zr, | 1873 | zoran_set_norm (struct zoran *zr, |
1874 | int norm) /* VIDEO_MODE_* */ | 1874 | int norm) /* VIDEO_MODE_* */ |
1875 | { | 1875 | { |
1876 | int norm_encoder, on; | 1876 | int norm_encoder, on; |
1877 | 1877 | ||
@@ -2006,9 +2006,9 @@ zoran_set_input (struct zoran *zr, | |||
2006 | 2006 | ||
2007 | static int | 2007 | static int |
2008 | zoran_do_ioctl (struct inode *inode, | 2008 | zoran_do_ioctl (struct inode *inode, |
2009 | struct file *file, | 2009 | struct file *file, |
2010 | unsigned int cmd, | 2010 | unsigned int cmd, |
2011 | void *arg) | 2011 | void *arg) |
2012 | { | 2012 | { |
2013 | struct zoran_fh *fh = file->private_data; | 2013 | struct zoran_fh *fh = file->private_data; |
2014 | struct zoran *zr = fh->zr; | 2014 | struct zoran *zr = fh->zr; |
@@ -2095,7 +2095,7 @@ zoran_do_ioctl (struct inode *inode, | |||
2095 | break; | 2095 | break; |
2096 | 2096 | ||
2097 | /* RJ: the documentation at http://roadrunner.swansea.linux.org.uk/v4lapi.shtml says: | 2097 | /* RJ: the documentation at http://roadrunner.swansea.linux.org.uk/v4lapi.shtml says: |
2098 | * | 2098 | * |
2099 | * * "The VIDIOCSCHAN ioctl takes an integer argument and switches the capture to this input." | 2099 | * * "The VIDIOCSCHAN ioctl takes an integer argument and switches the capture to this input." |
2100 | * * ^^^^^^^ | 2100 | * * ^^^^^^^ |
2101 | * * The famos BTTV driver has it implemented with a struct video_channel argument | 2101 | * * The famos BTTV driver has it implemented with a struct video_channel argument |