diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-15 10:08:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-15 10:08:53 -0300 |
| commit | 0cfed3d3248dd4ddfa340199ae3e3c33d4bb43be (patch) | |
| tree | 669b4d9e0e51d6045537aa20cf08541dacffe542 /linux/drivers/media | |
| parent | 5b29ed31cc662b1e4b3af6b335bb867268e85cc8 (diff) | |
| download | mediapointer-dvb-s2-0cfed3d3248dd4ddfa340199ae3e3c33d4bb43be.tar.gz mediapointer-dvb-s2-0cfed3d3248dd4ddfa340199ae3e3c33d4bb43be.tar.bz2 | |
Sync some small differences from kernel tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/saa717x.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/zr364xx.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa717x.c b/linux/drivers/media/video/saa717x.c index 030d07dd6..bdae62189 100644 --- a/linux/drivers/media/video/saa717x.c +++ b/linux/drivers/media/video/saa717x.c @@ -1529,7 +1529,6 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = { .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL, #endif }; - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) EXPORT_NO_SYMBOLS; #endif diff --git a/linux/drivers/media/video/zr364xx.c b/linux/drivers/media/video/zr364xx.c index 0afd1c9c1..c2abb3af9 100644 --- a/linux/drivers/media/video/zr364xx.c +++ b/linux/drivers/media/video/zr364xx.c @@ -395,7 +395,7 @@ static int read_frame(struct zr364xx_camera *cam, int framenum) } -static ssize_t zr364xx_read(struct file *file, char *buf, size_t cnt, +static ssize_t zr364xx_read(struct file *file, char __user *buf, size_t cnt, loff_t * ppos) { unsigned long count = cnt; |